[Git][NTPsec/ntpsec][master] 2 commits: Fix path to python2 for AsciiDoc-classic2-Debian-Old CI target

[Matt Selsky (@selsky)]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
e93bbcc5 by Matt Selsky at 2023-06-19T23:23:45-04:00
Fix path to python2 for AsciiDoc-classic2-Debian-Old CI target

We need to use the "python2-dev" package to get the python2 binary as a
dependency. If we use "python2.7-dev" then we get a python2.7 binary.

- - - - -
a61ddcf2 by Matt Selsky at 2023-06-19T23:40:13-04:00
Revert 'Consolidate macOS CI target definition behind "macos_saas_runners"'
(96501fdf754e9215def5807fcbce62b467dde223)

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -34,11 +34,6 @@ include:
   <<: *job_definition
   allow_failure: true
 
-.macos_saas_runners:
-  tags:
-    - saas-macos-medium-m1
-  image: macos-12-xcode-14
-
 alpine-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/alpine
@@ -107,7 +102,7 @@ AsciiDoc-classic2-Debian-Old:
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
   script:
     - apt-get update
-    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python2.7-dev asciidoc-base
+    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python2-dev asciidoc-base
     - python2 ./waf configure --enable-doc --enable-manpage build --disable-nts
 
 debian-oldstable-basic:
@@ -376,8 +371,7 @@ coverity-scan:
 
 macos-basic:
   <<: *job_definition
-  extends:
-    - .macos_saas_runners
+  image: macos-12-xcode-14
   script:
     - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3"
     - DESTDIR=build/prison python ./waf install
@@ -386,15 +380,18 @@ macos-basic:
     - sudo python ./waf install
     - sudo python ./waf uninstall
     - rm -rvf build/prison ./prison ../prison
+  tags:
+    - saas-macos-medium-m1
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 macos-refclocks:
   <<: *job_definition
-  extends:
-    - .macos_saas_runners
+  image: macos-12-xcode-14
   script:
     - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log
+  tags:
+    - saas-macos-medium-m1
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/6dd3a4acd52f30a0a52fea6f42447fd91f2fb9b9...a61ddcf296c92904cfb410c0afd24a48b8bf4613

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/6dd3a4acd52f30a0a52fea6f42447fd91f2fb9b9...a61ddcf296c92904cfb410c0afd24a48b8bf4613
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/20230620/a7015312/attachment-0001.htm>