[Git][NTPsec/ntpsec][master] Update cross-armhf-build CI job for python3.11

[Richard Laager (@rlaager)]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
63e894b1 by Matt Selsky at 2023-02-16T01:28:05+00:00
Update cross-armhf-build CI job for python3.11

The underlying distribution has updated python versions so take this
opportunity to stop hardcoding. Also remove "-pp" from waf invocation since
this flag is meant for a progress bar for IDEs and CI jobs don't need that.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -344,8 +344,9 @@ cross-armhf-build:
   <<: *job_definition_allow_failure
   image: $CI_REGISTRY/ntpsec/ntpsec/cross-armhf
   script:
-    - PYTHON_VERSION=3.10 PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.10' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.10/dist-packages --pythonarchdir=/usr/libhf/python3.10/dist-packages build -pp --enable-pylib=ffi
-    - PYTHON_VERSION=3.10 PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags '-I/usr/include/ -I/usr/include/python3.10' --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python3.10/dist-packages --pythonarchdir=/usr/libhf/python3.10/dist-packages build -pp --enable-pylib=ext
+    - pyver=$(python3 -c 'import sys;print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+    - PYTHON_VERSION=${pyver} PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags "-I/usr/include/ -I/usr/include/python${pyver}" --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python${pyver}/dist-packages --pythonarchdir=/usr/libhf/python${pyver}/dist-packages build --enable-pylib=ffi
+    - PYTHON_VERSION=${pyver} PYTAG=cpython3 pyext_PATTERN="%s.so" PYTHON_LDFLAGS='-lpthread -ldl' ./waf configure --disable-doc --disable-manpage --disable-nts --cross-compiler=arm-linux-gnueabihf-gcc --cross-cflags "-I/usr/include/ -I/usr/include/python${pyver}" --cross-ldflags '-L/usr/libhf' --pythondir=/usr/libhf/python${pyver}/dist-packages --pythonarchdir=/usr/libhf/python${pyver}/dist-packages build --enable-pylib=ext
   tags:
 
 gentoo-basic:



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

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/63e894b1b17f840b0d162b88b97112cddb47894b
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/20230223/11f29ed8/attachment.htm>