Skip to content

Commit

Permalink
Merge branch 'macos_ci' into 'main'
Browse files Browse the repository at this point in the history
interim solution for macOS CI

See merge request GNOME/glib!3503
  • Loading branch information
pwithnall committed Aug 12, 2023
2 parents 1e8d310 + 439204e commit 65e7a10
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
27 changes: 21 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -519,23 +519,38 @@ freebsd-13-x86_64:
- "_build/glib/glibconfig.h"
- "_build/meson-logs"

.macos:
macos-x86_64:
extends: .only-origin
stage: build
tags:
- macos
- macosintel
needs: []
cache: []
variables:
GIT_SUBMODULE_STRATEGY: normal
# -Wno-overlength-strings
# libpcre2 gets built as a subproject, but the default Clang options on
# macOS limit string lengths to 4095B — pcre2_error.c has a string of length
# 4380B
CFLAGS: '-Wno-overlength-strings'
CFLAGS: "-Wno-overlength-strings"
# redirect to the runner's volatile temporary directory
TMPDIR: /Users/Shared/work/tmp
# keep the user profile clean
PIP_CACHE_DIR: /Users/Shared/build/cache
PIPENV_CACHE_DIR: $PIP_CACHE_DIR
PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
# target OS X 10.9 Mavericks for backward compatibility
SDKROOT: /opt/sdks/MacOSX10.9.sdk
# use the runner's ccache directory
CCACHE_DIR: /Users/Shared/work/ccache
before_script:
- bash .gitlab-ci/show-execution-environment.sh
- pip3 install --user meson==1.0.0
- pip3 install --user ninja
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
- python3 -m venv .venv
- ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
- ln -s /opt/ccache/ccache .venv/bin
- source .venv/bin/activate
- pip3 install meson==1.2.0
- pip3 install ninja==1.11.1
script:
# FIXME: Use --wrap-mode=default so we download dependencies each time,
# until the macOS runner is a VM where we can use a pre-made image which
Expand Down
8 changes: 6 additions & 2 deletions gio/tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ gio_tests = {
},
'g-file' : {},
'g-file-info' : {
'can_fail' : host_system == 'windows' and cc.get_id() != 'gcc',
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3070
'can_fail' : host_system == 'darwin' or host_system == 'windows' and cc.get_id() != 'gcc',
},
'g-icon' : {},
'gdbus-addresses' : {},
Expand Down Expand Up @@ -281,7 +282,10 @@ if host_machine.system() != 'windows'
'unix-streams' : {},
'g-file-info-filesystem-readonly' : {},
'gschema-compile' : {'install' : false},
'trash' : {},
'trash' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3069
'can_fail' : host_system == 'darwin',
},
}

# LD_PRELOAD modules don't work so well with AddressSanitizer
Expand Down

0 comments on commit 65e7a10

Please sign in to comment.