summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2022-05-13 08:38:22 +0200
committerMiklos Vajna <vmiklos@collabora.com>2022-05-13 10:43:03 +0200
commitbfb8b4431fba416e66fc331d5480f30ec565c93d (patch)
tree4905663b85c3e4427570251aa911172a00244b4f
parentinfobar: enable info bar handler to check ... (diff)
downloadonline-bfb8b4431fba416e66fc331d5480f30ec565c93d.tar.gz
online-bfb8b4431fba416e66fc331d5480f30ec565c93d.zip
CI: codeql-analysis: work with core co-22.05 assets
Otherwise we fail to find new callbacks, see e.g. <https://github.com/CollaboraOnline/online/runs/6365091834?check_suite_focus=true>. And a similar blind fix for the freebsd CI job. Signed-off-by: Miklos Vajna <vmiklos@collabora.com> Change-Id: I820823d0307d0a4a5d8c51b944c01b2b9ba6632a
-rw-r--r--.cirrus.yml4
-rw-r--r--.github/workflows/codeql-analysis.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index b98a9b3266..7a2c94e44c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,8 +11,8 @@ task:
- env ASSUME_ALWAYS_YES=yes pkg install -y gmake pkgconf poco cppunit autotools coreutils git bash npm png pango
- mkdir libreoffice-src
- cd libreoffice-src
- - fetch https://github.com/CollaboraOnline/online/releases/download/for-code-assets/LibreOfficeKit-includes-co-2021.tar.gz
- - tar -xzf LibreOfficeKit-includes-co-2021.tar.gz
+ - fetch https://github.com/CollaboraOnline/online/releases/download/for-code-assets/LibreOfficeKit-includes-co-22.05.tar.gz
+ - tar -xzf LibreOfficeKit-includes-co-22.05.tar.gz
build_script:
- mkdir .git/hooks
- pw useradd -n cool -d /tmp/coolhome -m
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3595408bf9..3569510bbb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -75,8 +75,8 @@ jobs:
- if: matrix.language == 'cpp'
name: Configure
run: |
- cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-2021-assets.tar.gz
- tar xvf core-co-2021-assets.tar.gz && rm core-co-2021-assets.tar.gz && export LOCOREPATH=$(pwd)
+ cd .. && wget https://github.com/CollaboraOnline/online/releases/download/for-code-assets/core-co-22.05-assets.tar.gz
+ tar xvf core-co-22.05-assets.tar.gz && rm core-co-22.05-assets.tar.gz && export LOCOREPATH=$(pwd)
cd online && ./autogen.sh
./configure --enable-silent-rules --with-lokit-path=${LOCOREPATH}/include --with-lo-path=${LOCOREPATH}/instdir --enable-debug --disable-setcap
cd browser && npm update