]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA: misc updates: impacket, timeouts, mingw-w64 32-bit
authorViktor Szakats <commit@vsz.me>
Mon, 16 Sep 2024 07:48:41 +0000 (09:48 +0200)
committerViktor Szakats <commit@vsz.me>
Mon, 16 Sep 2024 13:43:21 +0000 (15:43 +0200)
- NetBSD: enable impacket. Debatable if this hefty package is worth it
  for the single SMB test (1451) run curl uses it for.
  (on the upside, it seems to install instantly on NetBSD)
  It's also a versioned package name that requires active maintenance.
  The unversioned name doesn't work, though that's what the package
  search returns: https://pkgsrc.se/net/py-impacket

- FreeBSD: stop installing impacket deps explicitly.
  They are automatically installed via the impacket package.

- Linux: put time limit on test runs.
  Started hanging yesterday:
  linux: https://github.com/curl/curl/actions/runs/10875011573/job/30172946986#step:41:3731
  awslc: https://github.com/curl/curl/actions/runs/10879782864/job/30185188509
  wolfssl: https://github.com/curl/curl/actions/runs/10879782864/job/30185188509

- distcheck: reduce time limit to 15m (was 30m)
  Linux tests started to hang, so reduce the timeout from 30 minutes
  to 15. These jobs normally take 3 to 6 minutes to finish.
  https://github.com/curl/curl/actions/runs/10879479914

- Windows: add 32-bit MSYS2/mingw-w64 job.
  Follow-up to e53523fef07894991c69d907a7c7794c7ada4ff4 #14859

Closes #14929

.github/workflows/awslc.yml
.github/workflows/distcheck.yml
.github/workflows/linux.yml
.github/workflows/non-native.yml
.github/workflows/windows.yml
.github/workflows/wolfssl.yml

index 305ae210f03d9bf7206e2e2337c9200b07160dca..479a720732422a06780d74c58a5db05332d99d53 100644 (file)
@@ -102,6 +102,7 @@ jobs:
 
       - run: make -C build V=1 test-ci
         name: 'run tests'
+        timeout-minutes: 15
 
   cmake:
     name: awslc (cmake)
index 90c144c54b0c25fdb05ba3df108ed66ab84e955d..60307cc93f89712b223d5b83d7c80c1d54e6682e 100644 (file)
@@ -22,7 +22,7 @@ permissions: {}
 jobs:
   maketgz-and-verify-in-tree:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
@@ -64,7 +64,7 @@ jobs:
 
   verify-out-of-tree-docs:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 15
     needs: maketgz-and-verify-in-tree
     steps:
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
@@ -87,7 +87,7 @@ jobs:
 
   verify-out-of-tree-autotools-debug:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 15
     needs: maketgz-and-verify-in-tree
     steps:
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
@@ -108,7 +108,7 @@ jobs:
 
   verify-out-of-tree-cmake:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 15
     needs: maketgz-and-verify-in-tree
     steps:
       - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
index 27ca2b5786ca8958680d4f00e82124ef6450c269..a1e72934652386ce133e03bed1e56551e0e26f1a 100644 (file)
@@ -549,6 +549,7 @@ jobs:
 
       - name: 'run tests'
         if: ${{ matrix.build.install_steps != 'skipall' && matrix.build.install_steps != 'skiprun' }}
+        timeout-minutes: ${{ contains(matrix.build.install_packages, 'valgrind') && 30 || 15 }}
         run: |
           export TFLAGS='${{ matrix.build.tflags }}'
           if [[ '${{ matrix.build.install_packages }}' = *'heimdal-dev'* ]]; then
index abb974e583a02858407efcb864ed458b7f0e471c..6c7296c63ae51ab24d5dadab71520c9e756839ac 100644 (file)
@@ -53,7 +53,7 @@ jobs:
           architecture: ${{ matrix.arch }}
           run: |
             # https://pkgsrc.se/
-            sudo pkgin -y install cmake ninja-build pkg-config perl brotli heimdal openldap-client libssh2 libidn2 libpsl nghttp2  # python311 py311-impacket
+            sudo pkgin -y install cmake ninja-build pkg-config perl brotli heimdal openldap-client libssh2 libidn2 libpsl nghttp2 py311-impacket
             cmake -B bld -G Ninja \
               -DCMAKE_UNITY_BUILD=ON \
               -DCURL_WERROR=ON \
@@ -129,7 +129,7 @@ jobs:
           run: |
             # https://ports.freebsd.org/
             sudo pkg install -y autoconf automake libtool \
-              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-openssl py311-impacket py311-cryptography
+              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket
             autoreconf -fi
             export CC='${{ matrix.compiler }}'
             mkdir bld && cd bld && ../configure --enable-debug --enable-warnings --enable-werror \
@@ -156,7 +156,7 @@ jobs:
           run: |
             # https://ports.freebsd.org/
             sudo pkg install -y cmake ninja perl5 \
-              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-openssl py311-impacket py311-cryptography
+              pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket
             cmake -B bld -G Ninja \
               '-DCMAKE_C_COMPILER=${{ matrix.compiler }}' \
               -DCMAKE_UNITY_BUILD=ON \
index 770fefb96ca597b93ba131648f11a84ab05f026b..964bb6513eb790981685e11dc0f461e0735fda43 100644 (file)
@@ -57,6 +57,7 @@ jobs:
           - { build: 'cmake'    , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: 'skiprun'                 , config: '-DENABLE_DEBUG=OFF -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_CURLDEBUG=ON', type: 'Release', name: 'schannel R TrackMemory' }
           - { build: 'cmake'    , sys: 'clang64', env: 'clang-x86_64', tflags: 'skiprun'                 , config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_OPENSSL=ON -DENABLE_UNICODE=OFF', type: 'Release', name: 'openssl' }
           - { build: 'cmake'    , sys: 'mingw64', env: 'x86_64'      , tflags: 'skiprun'                 , config: '-DENABLE_DEBUG=OFF -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DBUILD_EXAMPLES=OFF', type: 'Release', test: 'uwp', name: 'schannel R' }
+          - { build: 'cmake'    , sys: 'mingw32', env: 'i686'        , tflags: 'skiprun'                 , config: '-DENABLE_DEBUG=OFF -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DBUILD_EXAMPLES=OFF', type: 'Release', name: 'schannel R' }
       fail-fast: false
     steps:
       - run: git config --global core.autocrlf input
index a156dbbf39e9edc18e7d7e36addc7488c72a5e85..1d5400d6a92cc138417d8c5fe2948de304e18712 100644 (file)
@@ -98,5 +98,6 @@ jobs:
 
       - run: make V=1 test-ci
         name: 'run tests'
+        timeout-minutes: ${{ contains(matrix.build.install, 'valgrind') && 30 || 15 }}
         env:
           TFLAGS: "${{ matrix.build.tflags }}"