From: Viktor Szakats <commit@vsz.me>
Date: Sun, 15 Sep 2024 00:48:18 +0000 (+0200)
Subject: GHA/macos: make impacket found by tests
X-Git-Tag: curl-8_10_1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8709404fe9f6696ac7d4c6d1c43529acbb311f5e;p=thirdparty%2Fcurl.git

GHA/macos: make impacket found by tests

Also move impacket installation right before the test run to avoid
spending 10s installing if the build fails.

Closes #14913
---

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index acc020f673..e2368956dc 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -166,12 +166,6 @@ jobs:
             brew unlink openssl
           fi
 
-      - name: 'pip3 install'
-        run: |
-          python3 -m venv $HOME/venv
-          source $HOME/venv/bin/activate
-          python3 -m pip install impacket
-
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: 'toolchain versions'
@@ -243,6 +237,12 @@ jobs:
       - name: 'make tests'
         run: make -C bld V=1 -C tests
 
+      - name: 'pip3 install'
+        run: |
+          python3 -m venv $HOME/venv
+          source $HOME/venv/bin/activate
+          python3 -m pip install impacket
+
       - name: 'run tests'
         timeout-minutes: 20
         run: |
@@ -262,6 +262,7 @@ jobs:
             TFLAGS+=' ~313'  # SecureTransport does not support crl file
             TFLAGS+=' ~1631 ~1632'  # SecureTransport is not able to shutdown ftp over https gracefully yet
           fi
+          PATH="$HOME/venv/bin:$PATH"
           rm -f $HOME/.curlrc
           make -C bld V=1 test-ci
 
@@ -315,12 +316,6 @@ jobs:
             brew unlink openssl
           fi
 
-      - name: 'pip3 install'
-        run: |
-          python3 -m venv $HOME/venv
-          source $HOME/venv/bin/activate
-          python3 -m pip install impacket
-
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: 'toolchain versions'
@@ -377,6 +372,12 @@ jobs:
       - name: 'cmake build tests'
         run: ninja -C bld testdeps
 
+      - name: 'pip3 install'
+        run: |
+          python3 -m venv $HOME/venv
+          source $HOME/venv/bin/activate
+          python3 -m pip install impacket
+
       - name: 'cmake run tests'
         timeout-minutes: 10
         run: |
@@ -396,6 +397,7 @@ jobs:
             TFLAGS+=' ~313'  # SecureTransport does not support crl file
             TFLAGS+=' ~1631 ~1632'  # SecureTransport is not able to shutdown ftp over https gracefully yet
           fi
+          PATH="$HOME/venv/bin:$PATH"
           rm -f $HOME/.curlrc
           ninja -C bld test-ci