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

[James Browning]

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


Commits:
f34b179e by James Browning at 2021-03-01T14:48:07-08:00
CI: change asciidoc 8 jons to Debian oldstable and asciidoc 9 to Alpine.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -76,18 +76,18 @@ AsciiDoc-3-Fedora:
     - asciidoc3/asciidoc3 --version || echo -n
     - PATH="$PWD/asciidoc3:$PATH" python3 ./waf configure --enable-doc --enable-manpage build
 
-AsciiDoc-classic2-Alpine:
+AsciiDoc-classic2-Debian-oldstable:
   <<: *job_definition
-  image: alpine
+  image: debian:oldstable
   script:
-    - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python2-dev asciidoc
+    - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install asciidoc-base
     - python ./waf configure --enable-doc --enable-manpage build
 
-AsciiDoc-classic3-Alpine:
+AsciiDoc-classic3-Debian-oldstable:
   <<: *job_definition
-  image: alpine
+  image: debian:oldstable
   script:
-    - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev asciidoc
+    - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get asciidoc-base
     - python3 ./waf configure --enable-doc --enable-manpage build
 
 AsciiDoc-no:
@@ -97,16 +97,16 @@ 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-py3-Alpine:
   <<: *job_definition
-  image: ubuntu:devel
+  image: alpine
   script:
-    - apt-get update
+    - apk update && apk add gcc bison musl-dev openssl-dev libcap-dev python3-dev asciidoc
     - 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-oldstable-basic:
-  <<: *job_definition
+ <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/debian-oldstable
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --disable-nts build --pyshebang "/usr/bin/env python3"



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/f34b179e1b09537dfbd12db89cd5263b24c5e276
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/20210301/24d12e3c/attachment-0001.htm>