[Git][NTPsec/ntpsec][crossfail] 2 commits: Temporarily remove disconnected runner jobs ...

[James Browning]

James Browning pushed to branch crossfail at NTPsec / ntpsec


Commits:
d638145e by James Browning at 2020-12-22T03:07:32-08:00
Temporarily remove disconnected runner jobs ...

Reverting this commit will bring back Ubuntu cross compilation and FreeBSD jobs
- - - - -
ba6284d5 by James Browning at 2020-12-22T03:07:32-08:00
ntp.ntpc: Fix libntpc version checking.

- - - - -


2 changed files:

- .gitlab-ci.yml
- pylib/ntpc.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -203,50 +203,6 @@ ubuntu-devel-refclocks:
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
-freebsd-11-basic:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage --disable-nts build
-    - DESTDIR=build/prison python ./waf install
-    - DESTDIR=./prison python ./waf install
-    - DESTDIR=../prison python ./waf install
-    - rm -rvf build/prison ./prison ../prison
-  tags:
-    - freebsd-11
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
-freebsd-11-refclocks:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage --disable-nts --refclock=all build
-  tags:
-    - freebsd-11
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
-freebsd-12-basic:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage build
-    - DESTDIR=build/prison python ./waf install
-    - DESTDIR=./prison python ./waf install
-    - DESTDIR=../prison python ./waf install
-    - rm -rvf build/prison ./prison ../prison
-  tags:
-    - freebsd-12
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
-freebsd-12-refclocks:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage --refclock=all build
-  tags:
-    - freebsd-12
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
 centos-latest-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/centos-latest
@@ -375,15 +331,6 @@ debian-stable-mDNS-refclocks:
   script:
     - python ./waf configure --disable-doc --disable-manpage --refclock=all build
 
-cross-build:
-  <<: *job_definition_allow_failure
-  script:
-    - PYTHON_VERSION=2.7 PYTAG=cpython27 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc-5 --cross-cflags '-I/srv/arm-local/include -I/srv/arm-local/include/python2.7' --cross-ldflags '-L/srv/arm-local/lib' --pythondir=/srv/arm-local/lib/python2.7/dist-packages --pythonarchdir=/srv/arm-local/lib/python2.7/dist-packages build
-  tags:
-    - ubuntu-1604-lts
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
 gentoo-basic:
   <<: *job_definition
   image: $CI_REGISTRY/ntpsec/ntpsec/gentoo


=====================================
pylib/ntpc.py
=====================================
@@ -44,7 +44,7 @@ def _dlo(paths):
         try:
             lib = ctypes.CDLL(ntpc_path, use_errno=True)
             wrap_version = "@NTPSEC_VERSION_EXTENDED@"
-            clib_version = ctypes.c_char_p.in_dll(lib, 'version').value
+            clib_version = ntp.poly.polystr(ctypes.c_char_p.in_dll(lib, 'version').value)
             if clib_version != wrap_version:
                 sys.stderr.write("ntp.ntpc wrong version %s !== %s" % (clib_version, wrap_version))
             return lib



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/c9ef966011bbf6e087cbcf63291c76051a3b2e63...ba6284d50fe1bc555b963307ef808de240b6f8d5
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/20201222/1e6eadd7/attachment-0001.htm>