diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-28 00:42:00 +0300 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-28 00:42:00 +0300 |
commit | 58939aa6d83c37a89a4349e5df935c8858896bcc (patch) | |
tree | ca05b738cafc12701a3076fe173b9a6243ce5f13 | |
parent | c228582223978019eb0ac8f3143e8e9e45b999aa (diff) |
ci: Update Windows image and macos/ios tags
The latest image contains VS 2019, and was built in
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1570
Part-of: <https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/63>
-rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6068817..2a56679 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ debian sid: - build/meson-logs/ .build windows: - image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master' + image: 'registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2022-01-26.3-main' stage: 'build' tags: - 'docker' @@ -58,12 +58,12 @@ debian sid: meson test -C build && meson test -C build --benchmark" -vs2017 amd64: +vs2019 amd64: extends: '.build windows' variables: ARCH: 'amd64' -vs2017 x86: +vs2019 x86: extends: '.build windows' variables: ARCH: 'x86' @@ -93,7 +93,7 @@ msys2: macos x86_64: stage: 'build' tags: - - gst-macos-10.15 + - gst-macos-11.1 artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}" expire_in: '5 days' @@ -102,14 +102,12 @@ macos x86_64: - "build/meson-logs/*txt" before_script: - pip3 install --upgrade pip - # Make sure meson is up to date - - pip3 install -U meson # Need to install certificates for python - pip3 install --upgrade certifi # Anther way to install certificates - open /Applications/Python\ 3.8/Install\ Certificates.command - # Get ninja - - pip3 install -U ninja + # Make sure meson and ninja are up to date + - pip3 install -U meson ninja script: - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH} - meson setup --werror build @@ -120,7 +118,7 @@ macos x86_64: ios arm64: stage: 'build' tags: - - gst-ios-13.2 + - gst-ios-14.3 artifacts: name: "${CI_JOB_NAME}_${CI_COMMIT_SHA}" expire_in: '5 days' @@ -129,12 +127,12 @@ ios arm64: - "build/meson-logs/*txt" before_script: - pip3 install --upgrade pip - # Make sure meson and meson are up to date - - pip3 install -U meson ninja # Need to install certificates for python - pip3 install --upgrade certifi # Anther way to install certificates - open /Applications/Python\ 3.8/Install\ Certificates.command + # Make sure meson and ninja are up to date + - pip3 install -U meson ninja script: - CERT_PATH=$(python3 -m certifi) && export SSL_CERT_FILE=${CERT_PATH} && export REQUESTS_CA_BUNDLE=${CERT_PATH} - | |