AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 13:30:02 +00:00
Code Issues Projects Releases Wiki Activity

ci: Check for SDKROOT environment variable

Browse Source 
The SDKROOT variable is _the_ "master switch" to set the target
OS version (much stricter compared to MACOSX_DEPLOYMENT_TARGET alone),
yet it has no impact on the output of 'xcodebuild -showsdks'.

Also rename the script to 'macos', it's not being called 'osx' anymore
since 2016 (Sierra).
This commit is contained in:
René de Hesselle 2024-02-18 20:31:36 +01:00
parent 6fd5e5f61c
commit 0d9bbc9d64
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -240,7 +240,7 @@ macos:
PIPENV_CACHE_DIR: $PIP_CACHE_DIR PIPENV_CACHE_DIR: $PIP_CACHE_DIR
PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
before_script: before_script:
- bash .gitlab-ci/show-info-osx.sh - .gitlab-ci/show-info-macos.sh
- python3 -m venv .venv - python3 -m venv .venv
# Building the introspection feature requires pkg-config and bison. # Building the introspection feature requires pkg-config and bison.
- curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ - curl -L $CI_API_V4_URL/projects/30437/packages/generic/pkgconfig/v0.29.2+10/pkg-config-0.29.2+10_$(uname -m).tar.xz | tar -C .venv -xJ

7
.gitlab-ci/show-info-osx.sh → .gitlab-ci/show-info-macos.sh
View File

@ -3,6 +3,11 @@
set -eux -o pipefail set -eux -o pipefail
xcodebuild -version || : xcodebuild -version || :
xcodebuild -showsdks || :
if [ -z "$SDKROOT" ]; then
xcodebuild -showsdks || :
else
echo "SDKROOT = $SDKROOT"
fi
system_profiler SPSoftwareDataType || : system_profiler SPSoftwareDataType || :