luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 20:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/more-meson-on-macos-and-windows' into 'main'

Browse Source 
ci: Use Meson 1.0.0 on Windows and macOS CI builds

See merge request GNOME/glib!3280
This commit is contained in:
Philip Withnall 2023-02-21 22:22:00 +00:00
commit 4a5d58715d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -325,6 +325,10 @@ msys2-mingw32:
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
CFLAGS: -coverage -ftest-coverage -fprofile-arcs CFLAGS: -coverage -ftest-coverage -fprofile-arcs
PYTHONUTF8: "1" PYTHONUTF8: "1"
# FIXME: For some reason enabling jit debugging "fixes" random python crashes
# see https://github.com/msys2/MINGW-packages/issues/11864 and
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973
MSYS: "winjitdebug"
script: script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
- C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
@ -351,6 +355,10 @@ msys2-clang64:
MSYSTEM: "CLANG64" MSYSTEM: "CLANG64"
CHERE_INVOKING: "yes" CHERE_INVOKING: "yes"
PYTHONUTF8: "1" PYTHONUTF8: "1"
# FIXME: For some reason enabling jit debugging "fixes" random python crashes
# see https://github.com/msys2/MINGW-packages/issues/11864 and
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973
MSYS: "winjitdebug"
script: script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
- C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh
@ -511,7 +519,7 @@ macos:
CFLAGS: '-Wno-overlength-strings' CFLAGS: '-Wno-overlength-strings'
before_script: before_script:
- bash .gitlab-ci/show-execution-environment.sh - bash .gitlab-ci/show-execution-environment.sh
- pip3 install --user meson==0.60.1 - pip3 install --user meson==1.0.0
- pip3 install --user ninja - pip3 install --user ninja
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
script: script:

2
.gitlab-ci/test-msvc.bat
View File

@ -12,7 +12,7 @@ for %%x in (%*) do (
set args=%args:~1% set args=%args:~1%
:: FIXME: make warnings fatal :: FIXME: make warnings fatal
pip3 install --upgrade --user meson==0.60.3 || goto :error pip3 install --upgrade --user meson==1.0.0 || goto :error
meson %args% _build || goto :error meson %args% _build || goto :error
python .gitlab-ci/check-missing-install-tag.py _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error
ninja -C _build || goto :error ninja -C _build || goto :error

2
.gitlab-ci/test-msys2.sh
View File

@ -26,7 +26,7 @@ CCACHE_BASEDIR="$(pwd)"
CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
export CCACHE_BASEDIR CCACHE_DIR export CCACHE_BASEDIR CCACHE_DIR
pip3 install --upgrade --user meson==0.60.3 pip3 install --upgrade --user meson==1.0.0
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
DIR="$(pwd)" DIR="$(pwd)"