[Git][NTPsec/ntpsec][master] 2 commits: Fix AsciiDoc 3 runner

[Richard Laager]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
acd4adef by Richard Laager at 2020-02-22T17:02:50-06:00
Fix AsciiDoc 3 runner

This was recently failing, but was somewhat intermittent.  It did not
have the docbook-xsl stylesheets installed, which meant it had to
download them (repeatedly, I think) from the Internet.

- - - - -
62f23d25 by Richard Laager at 2020-02-22T17:03:05-06:00
Cleanup some .gitlab-ci shell script

This adds some quotes and spaces.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -70,13 +70,13 @@ AsciiDoc-3-Fedora:
   <<: *job_definition
   image: fedora
   script:
-    - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget unzip libxslt
+    - yum -y install bison gcc openssl-devel libcap-devel pps-tools-devel python3-devel wget unzip libxslt docbook-style-xsl
     - wget https://asciidoc3.org/asciidoc3-3.1.0.zip
     - unzip asciidoc3-3.1.0.zip -d asciidoc3
     - ln -sv a2x3.py asciidoc3/a2x3
     - ln -sv asciidoc3.py asciidoc3/asciidoc3
-    - asciidoc3/asciidoc3 --version||echo -n
-    - PATH=$PWD/asciidoc3:$PATH python3 ./waf configure --enable-doc --enable-manpage build
+    - asciidoc3/asciidoc3 --version || echo -n
+    - PATH="$PWD/asciidoc3:$PATH" python3 ./waf configure --enable-doc --enable-manpage build
   tags:
     - gitlab-org
 
@@ -396,7 +396,7 @@ python-coverage:
   script:
     - apt-get update -qq && apt-get install -y -qq netbase bison python-dev python-coverage
     - python ./waf configure --disable-doc --disable-manpage build
-    - for i in build/main/tests/pylib/test_*; do python-coverage run -a --source build/main/pylib $i; done
+    - for i in build/main/tests/pylib/test_*; do python-coverage run -a --source build/main/pylib "$i"; done
     - python-coverage report
   tags:
     - gitlab-org
@@ -553,7 +553,7 @@ coverity-scan:
     - ./waf configure --disable-doc --disable-manpage --refclock=all
     - /opt/cov-analysis/bin/cov-build --dir cov-int ./waf build
     - tar czf ntpsec_coverity.tgz cov-int
-    - curl --form token=$COVERITY_TOKEN --form email=security at ntpsec.org --form file=@ntpsec_coverity.tgz --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=ntpsec
+    - curl --form token="$COVERITY_TOKEN" --form email=security at ntpsec.org --form file=@ntpsec_coverity.tgz --form version="$(git rev-parse --short HEAD)" --form description="Automatic submission by gitlab-ci" https://scan.coverity.com/builds?project=ntpsec
   tags:
     - ubuntu-1604-lts
   only:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/d9b141a1da0415681667f2cd6038d798d595fb27...62f23d25adedcbcc17c33e9398eff9e5b3d19db7

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/d9b141a1da0415681667f2cd6038d798d595fb27...62f23d25adedcbcc17c33e9398eff9e5b3d19db7
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/20200222/a86ad78d/attachment-0001.htm>