Merge pull request #720 from kiwix/few-workflow-fixes

Few workflow fixes
pull/722/head
Kelson 1 year ago committed by GitHub
commit 73f357a627
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -14,7 +14,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Setup python 3.10 - name: Setup Python 3.10
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: '3.10' python-version: '3.10'
@ -54,6 +54,8 @@ jobs:
WAIT_TIME_FACTOR_TEST: 10 WAIT_TIME_FACTOR_TEST: 10
Linux: Linux:
runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -69,22 +71,22 @@ jobs:
image_variant: focal image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
arch_name: linux-x86_64 arch_name: linux-x86_64
env: env:
HOME: /home/runner HOME: /home/runner
runs-on: ubuntu-latest
container: container:
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36" image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
steps: steps:
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: extract_branch
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
uses: kiwix/kiwix-build/actions/dl_deps_archive@main uses: kiwix/kiwix-build/actions/dl_deps_archive@main
with: with:
target_platform: ${{ matrix.target }} target_platform: ${{ matrix.target }}
- name: Compile - name: Compile
shell: bash shell: bash
run: | run: |

@ -13,7 +13,7 @@ jobs:
name: Deploy kiwix-tools Docker Image name: Deploy kiwix-tools Docker Image
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3.4.0 - uses: actions/checkout@v4
- name: build and publish kiwix-tools - name: build and publish kiwix-tools
uses: openzim/docker-publish-action@v10 uses: openzim/docker-publish-action@v10
with: with:
@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: build-and-push-kiwix-tools needs: build-and-push-kiwix-tools
steps: steps:
- uses: actions/checkout@v3.4.0 - uses: actions/checkout@v4
- name: build and publish kiwix-serve - name: build and publish kiwix-serve
uses: openzim/docker-publish-action@v10 uses: openzim/docker-publish-action@v10
with: with:

@ -31,9 +31,9 @@ jobs:
run: | run: |
if [[ $REF == refs/tags* ]] if [[ $REF == refs/tags* ]]
then then
echo "::set-output name=ppa::kiwixteam/release" echo "ppa=kiwixteam/release" >> $GITHUB_OUTPUT
else else
echo "::set-output name=ppa::kiwixteam/dev" echo "ppa=kiwixteam/dev" >> $GITHUB_OUTPUT
fi fi
env: env:
REF: ${{ github.ref }} REF: ${{ github.ref }}
@ -96,7 +96,7 @@ jobs:
args: --no-sign args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }} ppa: ${{ steps.ppa.outputs.ppa }}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v4
with: with:
name: Packages for ${{ matrix.distro }} name: Packages for ${{ matrix.distro }}
path: output path: output

Loading…
Cancel
Save