From a3708c68ce0440a3d4fb58b926e37e0d0899df6a Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 08:24:48 +0100 Subject: [PATCH 1/5] Replace deprecated 'set-output' in workflows --- .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 7dfc5eafd..6925a3f2d 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -32,9 +32,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 297627fbc76154f9445f27ec411cd1926d73a358 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 08:26:25 +0100 Subject: [PATCH 2/5] Bump-up to actions/upload-artifact@v4 --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6925a3f2d..26581466c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -97,7 +97,7 @@ jobs: args: --no-sign ppa: ${{ steps.ppa.outputs.ppa }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: Packages for ${{ matrix.distro }} path: output From 8fdaa5f4dba54dddf69f5548a0de0e0c672c84ae Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 08:27:43 +0100 Subject: [PATCH 3/5] Bump-up to actions/checkout@v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a207dc6b9..7611a8255 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: HOME: /Users/runner steps: - name: Retrieve source code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install packages run: | @@ -155,7 +155,7 @@ jobs: image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38" steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies uses: kiwix/kiwix-build/actions/dl_deps_archive@main with: From 50f04d706037aaa28e4c6622164e5ffd585d20e3 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 09:08:35 +0100 Subject: [PATCH 4/5] 'pkg-config' is already installed with proper version --- .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 7611a8255..3e2368727 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - name: Install packages run: | brew update - brew install pkg-config ninja meson + brew install ninja meson env: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 From f693f700bc873e38c2609276287e16cdf46a2765 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 09:13:26 +0100 Subject: [PATCH 5/5] Remove HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e2368727..542112114 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,6 @@ jobs: run: | brew update brew install ninja meson - env: - HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 - name: Install dependencies uses: kiwix/kiwix-build/actions/dl_deps_archive@main