mirror of https://github.com/BOINC/boinc.git
Merge pull request #5994 from BOINC/vko_fix_ci
[ci] Fix build running on Ubuntu 24.04
This commit is contained in:
commit
4362c8cf8e
|
@ -33,7 +33,7 @@ jobs:
|
|||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get -qq update
|
||||
sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.0-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
|
||||
sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.1-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip
|
||||
|
||||
- name: Cache dependencies
|
||||
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"dependencyVerboseResolve": false,
|
||||
"gpgDisableSign": false,
|
||||
"gpgDisableVerify": false,
|
||||
"gpgProvider": "gpg1",
|
||||
"gpgProvider": "gpg2",
|
||||
"downloadSourcePackages": false,
|
||||
"skipLegacyPool": true,
|
||||
"ppaDistributorID": "ubuntu",
|
||||
|
|
|
@ -93,12 +93,12 @@ pushd $CWD
|
|||
|
||||
rm -rf $CWD/http-data/$DISTRO/*
|
||||
|
||||
gpg1 --version
|
||||
gpg2 --version
|
||||
|
||||
# import public key to allow the repo mirroring
|
||||
gpg1 --no-default-keyring --primary-keyring $KEYRING --import $PUBKEYFILE || true
|
||||
gpg1 --no-default-keyring --primary-keyring $KEYRING --import $PRIVKEYFILE || true
|
||||
gpg1 --no-default-keyring --primary-keyring $KEYRING --list-keys
|
||||
gpg2 --no-default-keyring --primary-keyring $KEYRING --import $PUBKEYFILE || true
|
||||
gpg2 --no-default-keyring --primary-keyring $KEYRING --import $PRIVKEYFILE || true
|
||||
gpg2 --no-default-keyring --primary-keyring $KEYRING --list-keys
|
||||
|
||||
# create repo for indicated type and distribution
|
||||
aptly -config=$CONF_FILE -distribution=$DISTRO repo create boinc-$TYPE
|
||||
|
|
|
@ -59,12 +59,7 @@ jobs:
|
|||
- name: Install dependencies
|
||||
if: ${{ success() && env.SKIP_RUN == 0 }}
|
||||
run: |
|
||||
# Install aptly version 1.5.0+ (to support ubuntu xz compression)
|
||||
# gpg1 is used for compatibility with aptly
|
||||
wget -qO - https://www.aptly.info/pubkey.txt | sudo apt-key add -
|
||||
echo "deb http://repo.aptly.info/ squeeze main" | sudo tee -a /etc/apt/sources.list
|
||||
sudo apt update -qq
|
||||
sudo apt-get install -y aptly gnupg1 gpgv1
|
||||
sudo apt-get install -y aptly gnupg2 gpgv
|
||||
|
||||
- name: Setup GPG keys
|
||||
if: ${{ success() && env.SKIP_RUN == 0 }}
|
||||
|
|
|
@ -919,7 +919,7 @@ jobs:
|
|||
- name: Install dependencies
|
||||
if: ${{ success() && env.SKIP_RUN == 0 }}
|
||||
run: |
|
||||
sudo apt-get install -y aptly
|
||||
sudo apt-get install -y aptly gnupg2 gpgv
|
||||
|
||||
- name: Setup GPG keys
|
||||
if: ${{ success() && env.SKIP_RUN == 0 }}
|
||||
|
|
Loading…
Reference in New Issue