Skip to content

Commit

Permalink
Merge pull request #436 from openzim/few-fix-workflows
Browse files Browse the repository at this point in the history
Fix a few things in workflows
  • Loading branch information
kelson42 authored Dec 21, 2024
2 parents d79a053 + 93cb165 commit c8c08b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- macos-13
runs-on: ${{ matrix.os }}

Expand All @@ -32,10 +31,8 @@ jobs:
# upgrade from [email protected] to [email protected] fails to overwrite those
rm -f /usr/local/bin/2to3 /usr/local/bin/2to3-3.12 /usr/local/bin/idle3 /usr/local/bin/idle3.12 /usr/local/bin/pydoc3 /usr/local/bin/pydoc3.12 /usr/local/bin/python3 /usr/local/bin/python3-config /usr/local/bin/python3.12 /usr/local/bin/python3.12-config
brew install gcovr ninja libmagic
env:
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
- name: Install python modules
- name: Install Python modules
run: pip3 install meson==0.49.2 pytest

- name: Install dependencies
Expand Down Expand Up @@ -86,7 +83,7 @@ jobs:
run: |
set PKG_CONFIG_PATH=%cd%\BUILD_win-amd64\INSTALL\lib\pkgconfig
set CPPFLAGS=-I%cd%\BUILD_win-amd64\INSTALL\include
meson.exe setup . build -Dstatic-linkage=true --buildtype=debug
meson.exe setup . build -Dstatic-linkage=true --buildtype=release
cd build
ninja.exe
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 c8c08b0

Please sign in to comment.