Skip to content

Commit 73f357a

Browse files
authored
Merge pull request #720 from kiwix/few-workflow-fixes
Few workflow fixes
2 parents dac8499 + 0fd4abe commit 73f357a

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Checkout code
1515
uses: actions/checkout@v4
1616

17-
- name: Setup python 3.10
17+
- name: Setup Python 3.10
1818
uses: actions/setup-python@v5
1919
with:
2020
python-version: '3.10'
@@ -54,6 +54,8 @@ jobs:
5454
WAIT_TIME_FACTOR_TEST: 10
5555

5656
Linux:
57+
runs-on: ubuntu-22.04
58+
5759
strategy:
5860
fail-fast: false
5961
matrix:
@@ -69,22 +71,22 @@ jobs:
6971
image_variant: focal
7072
lib_postfix: '/x86_64-linux-gnu'
7173
arch_name: linux-x86_64
74+
7275
env:
7376
HOME: /home/runner
74-
runs-on: ubuntu-latest
77+
7578
container:
7679
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
80+
7781
steps:
78-
- name: Extract branch name
79-
shell: bash
80-
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
81-
id: extract_branch
8282
- name: Checkout code
83-
uses: actions/checkout@v3
83+
uses: actions/checkout@v4
84+
8485
- name: Install dependencies
8586
uses: kiwix/kiwix-build/actions/dl_deps_archive@main
8687
with:
8788
target_platform: ${{ matrix.target }}
89+
8890
- name: Compile
8991
shell: bash
9092
run: |

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Deploy kiwix-tools Docker Image
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v3.4.0
16+
- uses: actions/checkout@v4
1717
- name: build and publish kiwix-tools
1818
uses: openzim/docker-publish-action@v10
1919
with:
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-22.04
4343
needs: build-and-push-kiwix-tools
4444
steps:
45-
- uses: actions/checkout@v3.4.0
45+
- uses: actions/checkout@v4
4646
- name: build and publish kiwix-serve
4747
uses: openzim/docker-publish-action@v10
4848
with:

.github/workflows/package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
run: |
3232
if [[ $REF == refs/tags* ]]
3333
then
34-
echo "::set-output name=ppa::kiwixteam/release"
34+
echo "ppa=kiwixteam/release" >> $GITHUB_OUTPUT
3535
else
36-
echo "::set-output name=ppa::kiwixteam/dev"
36+
echo "ppa=kiwixteam/dev" >> $GITHUB_OUTPUT
3737
fi
3838
env:
3939
REF: ${{ github.ref }}
@@ -96,7 +96,7 @@ jobs:
9696
args: --no-sign
9797
ppa: ${{ steps.ppa.outputs.ppa }}
9898

99-
- uses: actions/upload-artifact@v3
99+
- uses: actions/upload-artifact@v4
100100
with:
101101
name: Packages for ${{ matrix.distro }}
102102
path: output

0 commit comments

Comments
 (0)