From 1a3fda6f790d649a173b45d853afca1ed4a01323 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:12:57 +0100 Subject: [PATCH 1/6] Deprecated set-output in workflow --- .github/workflows/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 036150a2..6a9f358f 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -38,9 +38,9 @@ jobs: run: | if [[ $REF == refs/tags* ]] then - echo "::set-output name=ppa::kiwixteam/release" + echo "ppa=kiwixteam/release" >> $GITHUB_OUTPUT else - echo "::set-output name=ppa::kiwixteam/dev" + echo "ppa=kiwixteam/dev" >> $GITHUB_OUTPUT fi env: REF: ${{ github.ref }} From 70cf8405293ebbddad4c45ca8e14e0ea3bde104d Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:25:01 +0100 Subject: [PATCH 2/6] Repin actsion in 'packages' workflow --- .github/workflows/package.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6a9f358f..34f29a02 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -26,11 +26,11 @@ jobs: # Pin your dependencies with https://github.com/mheap/pin-github-action steps: - name: Harden Runner - uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # pin@v2 + uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # pin@v2 with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4 # Determine which PPA we should upload to - name: PPA @@ -58,7 +58,7 @@ jobs: with: args: --no-sign - - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie + - uses: legoktm/gh-action-build-deb@debian-trixie if: matrix.distro == 'debian-trixie' name: Build package for debian-trixie id: build-debian-trixie @@ -101,7 +101,7 @@ jobs: args: --no-sign ppa: ${{ steps.ppa.outputs.ppa }} - - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # pin@v4 + - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # pin@v4 with: name: Packages for ${{ matrix.distro }} path: output From f01bd8c0b2331696ac6c2280a806d917f258b3e9 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:43:15 +0100 Subject: [PATCH 3/6] Comment-out Debian deb CI --- .github/workflows/package.yml | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 34f29a02..436e51ec 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -15,10 +15,10 @@ jobs: fail-fast: false matrix: distro: - - debian-unstable - - debian-trixie - - debian-bookworm - - debian-bullseye +# - debian-unstable +# - debian-trixie +# - debian-bookworm +# - debian-bullseye - ubuntu-noble - ubuntu-jammy - ubuntu-focal @@ -51,33 +51,33 @@ jobs: email: release+launchpad@kiwix.org distro: ${{ matrix.distro }} - - uses: legoktm/gh-action-build-deb@7a6b22239275ae4e425fefc6f1aeb1118160500d # pin@debian-unstable - if: matrix.distro == 'debian-unstable' - name: Build package for debian-unstable - id: build-debian-unstable - with: - args: --no-sign - - - uses: legoktm/gh-action-build-deb@debian-trixie - if: matrix.distro == 'debian-trixie' - name: Build package for debian-trixie - id: build-debian-trixie - with: - args: --no-sign - - - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm - if: matrix.distro == 'debian-bookworm' - name: Build package for debian-bookworm - id: build-debian-bookworm - with: - args: --no-sign - - - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye - if: matrix.distro == 'debian-bullseye' - name: Build package for debian-bullseye - id: build-debian-bullseye - with: - args: --no-sign +# - uses: legoktm/gh-action-build-deb@7a6b22239275ae4e425fefc6f1aeb1118160500d # pin@debian-unstable +# if: matrix.distro == 'debian-unstable' +# name: Build package for debian-unstable +# id: build-debian-unstable +# with: +# args: --no-sign + +# - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie +# if: matrix.distro == 'debian-trixie' +# name: Build package for debian-trixie +# id: build-debian-trixie +# with: +# args: --no-sign + +# - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm +# if: matrix.distro == 'debian-bookworm' +# name: Build package for debian-bookworm +# id: build-debian-bookworm +# with: +# args: --no-sign + +# - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye +# if: matrix.distro == 'debian-bullseye' +# name: Build package for debian-bullseye +# id: build-debian-bullseye +# with: +# args: --no-sign - uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble if: matrix.distro == 'ubuntu-noble' From f8be8e455bf24c24a59d0b4aad11a6da7b27fd4e Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:53:21 +0100 Subject: [PATCH 4/6] Remove linux cross-compilation of win32 --- .github/workflows/ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a610259..72ce5dc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,8 +160,6 @@ jobs: - linux-aarch64-dyn - android-arm - android-arm64 - - win32-static - - win32-dyn - wasm with_xapian: - true @@ -203,18 +201,6 @@ jobs: arch_name: aarch64-linux-android run_test: false coverage: false - - target: win32-static - image_variant: f35 - lib_postfix: '64' - arch_name: i686-w64-mingw32 - run_test: false - coverage: false - - target: win32-dyn - image_variant: f35 - lib_postfix: '64' - arch_name: i686-w64-mingw32 - run_test: false - coverage: false - target: wasm image_variant: focal lib_postfix: '/x86_64-linux-gnu' From 8f4adfc2961ae1b3d73d5b255e48e453b671a50a Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 18:05:49 +0100 Subject: [PATCH 5/6] Update a few actions --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72ce5dc4..3784277f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,15 +41,15 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + uses: step-security/harden-runner@v2 with: egress-policy: audit - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@v4 - name: Setup Python 3.10 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + uses: actions/setup-python@v5 with: python-version: '3.10' @@ -102,15 +102,15 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + uses: step-security/harden-runner@v2 with: egress-policy: audit - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@v4 - name: Setup python 3.10 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + uses: actions/setup-python@v5 with: python-version: '3.10' @@ -215,7 +215,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + uses: step-security/harden-runner@v2 with: egress-policy: audit @@ -226,7 +226,7 @@ jobs: target_platform: ${{ matrix.target }} - name: Retrieve source code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@v4 - name: Compile source code shell: bash @@ -296,12 +296,12 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1 + uses: step-security/harden-runner@v2 with: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@v4 with: persist-credentials: false From 0edd8596d58c72a8f5b32211fcb05a7fbf711e57 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 18:11:11 +0100 Subject: [PATCH 6/6] Don't reinstall pkg-config on macOS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3784277f..ab203e1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: - name: Install packages run: | brew update - brew install gcovr pkg-config ninja || brew link --overwrite python + brew install gcovr ninja || brew link --overwrite python - name: Install Python modules run: pip3 install meson pytest