Skip to content

Commit

Permalink
Merge pull request #720 from kiwix/few-workflow-fixes
Browse files Browse the repository at this point in the history
Few workflow fixes
  • Loading branch information
kelson42 authored Dec 20, 2024
2 parents dac8499 + 0fd4abe commit 73f357a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -54,6 +54,8 @@ jobs:
WAIT_TIME_FACTOR_TEST: 10

Linux:
runs-on: ubuntu-22.04

strategy:
fail-fast: false
matrix:
Expand All @@ -69,22 +71,22 @@ jobs:
image_variant: focal
lib_postfix: '/x86_64-linux-gnu'
arch_name: linux-x86_64

env:
HOME: /home/runner
runs-on: ubuntu-latest

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@v3
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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 73f357a

Please sign in to comment.