[Git][NTPsec/ntpsec][master] Switch macOS CI targets to open-beta images

[Richard Laager (@rlaager)]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
1f185940 by Matt Selsky at 2021-03-30T22:16:59+00:00
Switch macOS CI targets to open-beta images

gitlab-com/macos-buildcloud-runners-beta#2

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab-opttest-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -389,6 +389,7 @@ coverity-scan:
 
 macos-basic:
   <<: *job_definition
+  image: macos-11-xcode-12
   script:
     - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - DESTDIR=build/prison python ./waf install
@@ -398,16 +399,17 @@ macos-basic:
     - python ./waf uninstall
     - rm -rvf build/prison ./prison ../prison
   tags:
-    - macos
+    - shared-macos-amd64
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 macos-refclocks:
   <<: *job_definition
+  image: macos-11-xcode-12
   script:
     - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build
   tags:
-    - macos
+    - shared-macos-amd64
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -56,11 +56,12 @@ gentoo-hardened-options-tester:
 macos-options-tester:
   stage: test
   needs: []
+  image: macos-11-xcode-12
   script:
     - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python2.7 tests/option-tester.sh||true
     - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh
   tags:
-    - macos
+    - shared-macos-amd64
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/1f185940393764aa4194a17f6b86796e77494951

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/1f185940393764aa4194a17f6b86796e77494951
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20210330/db31c99b/attachment-0001.htm>