Skip to content

Commit

Permalink
Merge pull request #361 from openzim/improved-ci
Browse files Browse the repository at this point in the history
Multiple small CI improvements
  • Loading branch information
kelson42 authored Jul 24, 2023
2 parents ac863e6 + 410f8d2 commit a59661e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push]

jobs:
Macos:
runs-on: macos-latest
runs-on: macos-11
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -56,9 +56,9 @@ jobs:

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"
image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
steps:
- name: Extract branch name
shell: bash
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
distro:
- ubuntu-jammy
- ubuntu-focal
- ubuntu-kinetic
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -56,14 +55,6 @@ jobs:
args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}

- uses: legoktm/gh-action-build-deb@ubuntu-kinetic
if: matrix.distro == 'ubuntu-kinetic'
name: Build package for ubuntu-kinetic
id: build-ubuntu-kinetic
with:
args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}

- uses: actions/upload-artifact@v3
with:
name: Packages for ${{ matrix.distro }}
Expand Down

0 comments on commit a59661e

Please sign in to comment.