From f6f49a4627b7bc18cdb16ee690d1f2ee05acc052 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 30 Jul 2024 11:52:27 +0200 Subject: [PATCH] GHA/non-native: bump FreeBSD/arm64 python modules FreeBSD seems to upgrade their Python separately for arm64 and Intel. Today, arm64 caught up with the Intel packages. Update our CI to reflect it. Closes #14310 --- .github/workflows/non-native.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index 95a6d466fa..e7a158cf72 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -130,13 +130,7 @@ jobs: architecture: ${{ matrix.arch }} run: | # https://ports.freebsd.org/ - pkgs='autoconf automake libtool pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel' - if [ '${{ matrix.arch }}' = 'x86_64' ]; then - pkgs="${pkgs} py311-openssl py311-impacket py311-cryptography" - else - pkgs="${pkgs} py39-openssl py39-impacket py39-cryptography" - fi - sudo pkg install -y ${pkgs} + sudo pkg install -y autoconf automake libtool pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-openssl py311-impacket py311-cryptography autoreconf -fi export CC='${{ matrix.compiler }}' mkdir bld && cd bld && ../configure --enable-debug --enable-warnings --enable-werror \ @@ -164,13 +158,7 @@ jobs: architecture: ${{ matrix.arch }} run: | # https://ports.freebsd.org/ - pkgs='cmake pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel' - if [ '${{ matrix.arch }}' = 'x86_64' ]; then - pkgs="${pkgs} py311-openssl py311-impacket py311-cryptography" - else - pkgs="${pkgs} py39-openssl py39-impacket py39-cryptography" - fi - sudo pkg install -y ${pkgs} + sudo pkg install -y cmake pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-openssl py311-impacket py311-cryptography cmake -B bld \ '-DCMAKE_C_COMPILER=${{ matrix.compiler }}' \ -DCMAKE_UNITY_BUILD=ON \