[Git][NTPsec/ntpsec][master] 2 commits: Remove python2.7 opttest CI target for macOS

[Matt Selsky (@selsky)]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
42fd7dca by Matt Selsky at 2023-05-19T01:57:35-04:00
Remove python2.7 opttest CI target for macOS

macOS no longer includes python2 in the default image

- - - - -
978b769f by Matt Selsky at 2023-05-19T02:00:08-04:00
Update Homebrew pkgconfig path for new macOS image

- - - - -


2 changed files:

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


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -373,7 +373,7 @@ macos-basic:
   <<: *job_definition
   image: macos-12-xcode-14
   script:
-    - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
+    - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - DESTDIR=build/prison python ./waf install
     - DESTDIR=./prison python ./waf install
     - DESTDIR=../prison python ./waf install
@@ -389,7 +389,7 @@ macos-refclocks:
   <<: *job_definition
   image: macos-12-xcode-14
   script:
-    - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log
+    - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log
   tags:
     - saas-macos-medium-m1
   rules:


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -76,8 +76,7 @@ macos-options-tester:
   needs: []
   image: macos-12-xcode-14
   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
+    - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh
   tags:
     - saas-macos-medium-m1
   rules:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/06f9803371f992a23ee87a605db29ee0dec8a165...978b769f860ff194e56b641f0c967182ebb00f22

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/06f9803371f992a23ee87a605db29ee0dec8a165...978b769f860ff194e56b641f0c967182ebb00f22
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/20230519/e5caaa59/attachment-0001.htm>