-
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #436 from openzim/few-fix-workflows
Fix a few things in workflows
- Loading branch information
Showing
2 changed files
with
5 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,6 @@ jobs: | |
fail-fast: false | ||
matrix: | ||
os: | ||
- macos-12 | ||
- macos-13 | ||
runs-on: ${{ matrix.os }} | ||
|
||
|
@@ -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 | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters