From 147af61d5a51c76d24c895cba4afaba46560008c Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Mon, 6 Jan 2025 03:38:54 +0100 Subject: [PATCH] [ci] Fix build running on Ubuntu 24.04 Signed-off-by: Vitalii Koshura --- .github/workflows/coverity.yml | 2 +- .github/workflows/debrepo/aptly.bookworm.conf | 2 +- .github/workflows/debrepo/aptly.bullseye.conf | 2 +- .github/workflows/debrepo/aptly.buster.conf | 2 +- .github/workflows/debrepo/aptly.focal.conf | 2 +- .github/workflows/debrepo/aptly.jammy.conf | 2 +- .github/workflows/debrepo/aptly.noble.conf | 2 +- .github/workflows/debrepo/repo_update.sh | 8 ++++---- .github/workflows/linux-package-stable-release.yml | 7 +------ .github/workflows/linux-package.yml | 2 +- 10 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 5304b3f699..e2e42b4d97 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -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 diff --git a/.github/workflows/debrepo/aptly.bookworm.conf b/.github/workflows/debrepo/aptly.bookworm.conf index e7ab23364b..90891837f4 100644 --- a/.github/workflows/debrepo/aptly.bookworm.conf +++ b/.github/workflows/debrepo/aptly.bookworm.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/aptly.bullseye.conf b/.github/workflows/debrepo/aptly.bullseye.conf index 923984dd8f..7bb1259980 100644 --- a/.github/workflows/debrepo/aptly.bullseye.conf +++ b/.github/workflows/debrepo/aptly.bullseye.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/aptly.buster.conf b/.github/workflows/debrepo/aptly.buster.conf index 6e3fbd56bb..5a8f45b297 100644 --- a/.github/workflows/debrepo/aptly.buster.conf +++ b/.github/workflows/debrepo/aptly.buster.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/aptly.focal.conf b/.github/workflows/debrepo/aptly.focal.conf index 4042598a76..aa4277efe1 100644 --- a/.github/workflows/debrepo/aptly.focal.conf +++ b/.github/workflows/debrepo/aptly.focal.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/aptly.jammy.conf b/.github/workflows/debrepo/aptly.jammy.conf index a141f57b39..23ae3c48e1 100644 --- a/.github/workflows/debrepo/aptly.jammy.conf +++ b/.github/workflows/debrepo/aptly.jammy.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/aptly.noble.conf b/.github/workflows/debrepo/aptly.noble.conf index 2266d96182..5320020bbd 100644 --- a/.github/workflows/debrepo/aptly.noble.conf +++ b/.github/workflows/debrepo/aptly.noble.conf @@ -10,7 +10,7 @@ "dependencyVerboseResolve": false, "gpgDisableSign": false, "gpgDisableVerify": false, - "gpgProvider": "gpg1", + "gpgProvider": "gpg2", "downloadSourcePackages": false, "skipLegacyPool": true, "ppaDistributorID": "ubuntu", diff --git a/.github/workflows/debrepo/repo_update.sh b/.github/workflows/debrepo/repo_update.sh index d594d67e14..c904d3e4f7 100755 --- a/.github/workflows/debrepo/repo_update.sh +++ b/.github/workflows/debrepo/repo_update.sh @@ -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 diff --git a/.github/workflows/linux-package-stable-release.yml b/.github/workflows/linux-package-stable-release.yml index 308ed937af..fbffefdb01 100644 --- a/.github/workflows/linux-package-stable-release.yml +++ b/.github/workflows/linux-package-stable-release.yml @@ -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 }} diff --git a/.github/workflows/linux-package.yml b/.github/workflows/linux-package.yml index 9e139cd32a..60ed19cca8 100644 --- a/.github/workflows/linux-package.yml +++ b/.github/workflows/linux-package.yml @@ -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 }}