[Git][NTPsec/ntpsec][21C01-ci-asciidoc-py3] CI: change asciidoc 8 jobs to Debian oldstable and asciidoc 9 to Alpine.

[James Browning]

James Browning pushed to branch 21C01-ci-asciidoc-py3 at NTPsec / ntpsec


Commits:
53314b5b by James Browning at 2021-03-01T19:07:54-08:00
CI: change asciidoc 8 jobs to Debian oldstable and asciidoc 9 to Alpine.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -76,12 +76,12 @@ AsciiDoc-3-Fedora:
     - asciidoc3/asciidoc3 --version || echo -n
     - PATH="$PWD/asciidoc3:$PATH" python3 ./waf configure --enable-doc --enable-manpage build
 
-AsciiDoc-classic2-Alpine:
+AsciiDoc-py3-Alpine:
   <<: *job_definition
-  image: alpine
+  image: $CI_REGISTRY/ntpsec/ntpsec/alpine
   script:
-    - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python2-dev asciidoc
-    - python ./waf configure --enable-doc --enable-manpage build
+    - apk update && apk add python3-dev asciidoc
+    - python3 ./waf configure --enable-doc --enable-manpage build
 
 AsciiDoc-classic3-Alpine:
   <<: *job_definition
@@ -97,13 +97,21 @@ AsciiDoc-no:
     - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python2-dev
     - python ./waf configure --disable-doc --disable-manpage build
 
-AsciiDoc-py3-Ubuntu:
+AsciiDoc-classic3-Debian-Old:
   <<: *job_definition
-  image: ubuntu:devel
+  image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
   script:
     - apt-get update
-    - DEBIAN_FRONTEND="noninteractive" apt-get install -y netbase bison gcc libssl-dev libcap-dev pps-tools python3-dev asciidoc-base
-    - python3 ./waf configure --enable-doc --enable-manpage build
+    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python3-dev asciidoc-base
+    - python3 ./waf configure --enable-doc --enable-manpage build --disable-nts
+
+AsciiDoc-classic2-Debian-Old:
+  <<: *job_definition
+  image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
+  script:
+    - apt-get update
+    - DEBIAN_FRONTEND="noninteractive" apt-get install -y python2.7-dev asciidoc-base
+    - python2 ./waf configure --enable-doc --enable-manpage build --disable-nts
 
 debian-oldstable-basic:
   <<: *job_definition



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/53314b5bd7faa62b729cc5f9479b3de4d61e2232

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/53314b5bd7faa62b729cc5f9479b3de4d61e2232
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/20210302/3c1faa3b/attachment-0001.htm>