[Git][NTPsec/ntpsec][crossfail] 2 commits: ntp.keys: Fix a typo

[James Browning]

James Browning pushed to branch crossfail at NTPsec / ntpsec


Commits:
d9b20414 by Richard Laager at 2020-12-21T02:16:22-06:00
ntp.keys: Fix a typo

- - - - -
c9ef9660 by James Browning at 2020-12-21T23:16:50+00:00
CI: Allow FreeBSD to fail for the duration, Ubuntu cross already was.


- - - - -


2 changed files:

- .gitlab-ci.yml
- docs/includes/ntp.keys-body.adoc


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -204,7 +204,7 @@ ubuntu-devel-refclocks:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
 freebsd-11-basic:
-  <<: *job_definition
+  <<: *job_definition_allow_failure
   script:
     - python ./waf configure --disable-doc --disable-manpage --disable-nts build
     - DESTDIR=build/prison python ./waf install
@@ -217,7 +217,7 @@ freebsd-11-basic:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 freebsd-11-refclocks:
-  <<: *job_definition
+  <<: *job_definition_allow_failure
   script:
     - python ./waf configure --disable-doc --disable-manpage --disable-nts --refclock=all build
   tags:
@@ -226,7 +226,7 @@ freebsd-11-refclocks:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 freebsd-12-basic:
-  <<: *job_definition
+  <<: *job_definition_allow_failure
   script:
     - python ./waf configure --disable-doc --disable-manpage build
     - DESTDIR=build/prison python ./waf install
@@ -239,7 +239,7 @@ freebsd-12-basic:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
 freebsd-12-refclocks:
-  <<: *job_definition
+  <<: *job_definition_allow_failure
   script:
     - python ./waf configure --disable-doc --disable-manpage --refclock=all build
   tags:


=====================================
docs/includes/ntp.keys-body.adoc
=====================================
@@ -43,7 +43,7 @@ The +-cbc+ is appended to the `type` internally. Do not include it in `type`.
 AES is an abbreviation for aes-128.
 
 Note that MD5 was deprecated by RFC 8573 in June of 2019.
-+AES-128+ is currently prefered.  The code still supports
++AES-128+ is currently preferred.  The code still supports
 MD5 for backwards compatibility.
 
 FIPS 140-2, FIPS 180-4, and/or FIPS 202 may restrict your choices.



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/41c6b430fc82e640c06bc66da7d57f5fa81a8d18...c9ef966011bbf6e087cbcf63291c76051a3b2e63

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/41c6b430fc82e640c06bc66da7d57f5fa81a8d18...c9ef966011bbf6e087cbcf63291c76051a3b2e63
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/20201221/192b7bcc/attachment-0001.htm>