From 88ceebab8ae9b177ddd8d50133ab3f9e07f45738 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 16:43:50 +0100 Subject: [PATCH 1/6] Deprecate set-output fron package 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 d47c8276..de6b1c6a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -31,9 +31,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 87c6eb837d3ca907388021ffc49b8a472e402daf Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 16:46:25 +0100 Subject: [PATCH 2/6] 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 de6b1c6a..4817c5ae 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -96,7 +96,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 e6ff088ffa82ba51db10c213b00ca0642d12d1d1 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 16:54:58 +0100 Subject: [PATCH 3/6] Bump-up to action/checkout@v4 --- .github/workflows/ci.yml | 2 +- .github/workflows/docker.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de621a95..904085bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies uses: kiwix/kiwix-build/actions/dl_deps_archive@main with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4b251d60..035d0eaa 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ jobs: name: Deploy kiwix-tools Docker Image runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v4 - name: build and publish kiwix-tools uses: openzim/docker-publish-action@v10 with: @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-22.04 needs: build-and-push-kiwix-tools steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v4 - name: build and publish kiwix-serve uses: openzim/docker-publish-action@v10 with: From e12687b1ec0158de631350d1019620f0bab65e96 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 16:58:07 +0100 Subject: [PATCH 4/6] Use fix OS dependency --- .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 904085bd..2b382bff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: arch_name: linux-x86_64 env: HOME: /home/runner - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36" steps: From 998bbc6b0e01e6822fc2005324ed9bdbc857f081 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:01:10 +0100 Subject: [PATCH 5/6] Add a few spaces in workflow --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b382bff..30941c1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup python 3.10 + - name: Setup Python 3.10 uses: actions/setup-python@v5 with: python-version: '3.10' @@ -54,6 +54,8 @@ jobs: WAIT_TIME_FACTOR_TEST: 10 Linux: + runs-on: ubuntu-22.04 + strategy: fail-fast: false matrix: @@ -69,22 +71,27 @@ jobs: image_variant: focal lib_postfix: '/x86_64-linux-gnu' arch_name: linux-x86_64 + env: HOME: /home/runner - runs-on: ubuntu-22.04 + container: image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36" + steps: - name: Extract branch name shell: bash run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" id: extract_branch + - name: Checkout code uses: actions/checkout@v4 + - name: Install dependencies uses: kiwix/kiwix-build/actions/dl_deps_archive@main with: target_platform: ${{ matrix.target }} + - name: Compile shell: bash run: | From 0fd4abeeaeb22b6ca18a5b2755e039ba0d6817ec Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 20 Dec 2024 17:05:40 +0100 Subject: [PATCH 6/6] Remove a CI step which is now useless --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30941c1a..74cbb32f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,11 +79,6 @@ jobs: image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36" steps: - - name: Extract branch name - shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch - - name: Checkout code uses: actions/checkout@v4