test

JacobBarthelmeh · Oct 8, 2024 · 7239611 · 7239611
1 parent 57cdc4e
commit 7239611
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml
@@ -23,7 +23,7 @@ jobs:
           last=`curl -s https://api.github.com/repos/wolfssl/wolfssl/releases | grep tag_name | cut -d : -f 2,3 | tr -d \" | tr -d , | head -2 | tail -1`
           VERSIONS=$(echo "[ \"master\", \"$current\", \"$last\" ]")
           echo "wolfSSL versions found: $VERSIONS"
-          echo "::set-output name=versions::$VERSIONS"
+          echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
 
   build_wolfssl:
     needs: create_matrix

diff --git a/.github/workflows/sshd-test.yml b/.github/workflows/sshd-test.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache@v4
         id: cache-wolfssl
         with:
-          path: ${{ github.workspace }}/build-dir/
+          path: build-dir/
           key: wolfssh-sshd-wolfssl-${{ matrix.wolfssl }}-${{ matrix.os }}
           lookup-only: true
 
@@ -54,22 +54,21 @@ jobs:
       - name: Checking cache for wolfssl
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/build-dir/
+          path: build-dir/
           key: wolfssh-sshd-wolfssl-${{ matrix.wolfssl }}-${{ matrix.os }}
           fail-on-cache-miss: true
 
-      - uses: actions/checkout@v2
-      - name: Build wolfsshd
-        run: |
-          ls ${{ github.workspace }}/build-dir/
-          ./autogen.sh
-          ./configure --enable-debug --enable-all LDFLAGS="-L${{ github.workspace }}/build-dir/lib" CPPFLAGS="-I${{ github.workspace }}/build-dir/include -DWOLFSSH_NO_FPKI -DWOLFSSH_NO_SFTP_TIMEOUT -DWOLFSSH_MAX_SFTP_RW=4000000"
-          make check
+      - name: Checkout and build wolfssh
+        uses: wolfSSL/actions-build-autotools-project@v1
+        with:
+          repository: wolfssl/wolfssh
+          path: wolfssh
+          configure: --enable-debug --enable-all LDFLAGS="-L${{ github.workspace }}/build-dir/lib" CPPFLAGS="-I${{ github.workspace }}/build-dir/include -DWOLFSSH_NO_FPKI -DWOLFSSH_NO_SFTP_TIMEOUT -DWOLFSSH_MAX_SFTP_RW=4000000"
 
       - name: print config log
         if: always()
         run: cat config.log
 
       - name: Run wolfSSHd tests
-        working-directory: ./apps/wolfsshd/test
+        working-directory: ./wolfssh/apps/wolfsshd/test
         run: sudo ./run_all_sshd_tests.sh root