revert workflow items (not the cause)

Author: gojimmypi

.github/workflows/kyber.yml

@@ -14,7 +14,6 @@ env:
 jobs:
   build_liboqs:
     name: Build liboqs
-    if: github.repository_owner == 'wolfssl'
     runs-on: ubuntu-latest
     timeout-minutes: 4
     steps:

.github/workflows/os-check.yml

@@ -20,7 +20,6 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
     name: Build wolfssl
-    if: github.repository_owner == 'wolfssl'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 4
     steps:

.github/workflows/singlethread-check.yml

@@ -20,7 +20,6 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
     name: Build wolfssl
-    if: github.repository_owner == 'wolfssl'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 4
     steps:

.github/workflows/sshd-test.yml

@@ -6,121 +6,27 @@ on:
   pull_request:
     branches: [ '*' ]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  create_matrix:
-    runs-on: ubuntu-latest
-    outputs:
-        versions: ${{ steps.json.outputs.versions }}
-    steps:
-      - name: Create wolfSSL version matrix
-        id: json
-        run: |
-          current=`curl -s https://api.github.com/repos/wolfssl/wolfssl/releases | grep tag_name | cut -d : -f 2,3 | tr -d \" | tr -d , | tr -d ' ' | head -1`
-          last=`curl -s https://api.github.com/repos/wolfssl/wolfssl/releases | grep tag_name | cut -d : -f 2,3 | tr -d \" | tr -d , | tr -d ' ' | head -2 | tail -1`
-          VERSIONS=$(echo "[ \"master\", \"$current\", \"$last\" ]")
-          echo "wolfSSL versions found: $VERSIONS"
-          echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
-
-  build_wolfssl:
-    needs: create_matrix
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-        wolfssl: ${{ fromJson(needs.create_matrix.outputs['versions']) }}
-    name: Build wolfssl
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 4
-    steps:
-      - name: Checking cache for wolfssl
-        uses: actions/cache@v4
-        id: cache-wolfssl
-        with:
-          path: build-dir/
-          key: wolfssh-sshd-wolfssl-${{ matrix.wolfssl }}-${{ matrix.os }}
-          lookup-only: true
+  build:
 
-      - name: Checkout, build, and install wolfssl
-        if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-        uses: wolfSSL/actions-build-autotools-project@v1
-        with:
-          repository: wolfssl/wolfssl
-          ref: ${{ matrix.wolfssl }}
-          path: wolfssl
-          configure: --enable-all
-          check: false
-          install: true
+    runs-on: ubuntu-latest
 
-  build_wolfssh:
-    needs:
-      - build_wolfssl
-      - create_matrix
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-        wolfssl: ${{ fromJson(needs.create_matrix.outputs['versions']) }}
-    name: Build and test wolfsshd
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
     steps:
-      - name: Checking cache for wolfssl
-        uses: actions/cache@v4
-        with:
-          path: build-dir/
-          key: wolfssh-sshd-wolfssl-${{ matrix.wolfssl }}-${{ matrix.os }}
-          fail-on-cache-miss: true
-
-      - uses: actions/checkout@v4
-        with:
-          path: wolfssh/
-
-      - name: autogen
-        working-directory: ./wolfssh/
-        run: ./autogen.sh
-
-      - name: configure
-        working-directory: ./wolfssh/
-        run : |
-          ./configure --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 -DMAX_PATH_SZ=120"
-
-      - name: make check
-        working-directory: ./wolfssh/
-        run: make check
-
-      - name: Run wolfSSHd tests
-        working-directory: ./wolfssh/apps/wolfsshd/test
-        run: |
-          git log -3
-          sudo ./run_all_sshd_tests.sh
-
-      # could use optimization with caching
-      - name: Test memory after close down
-        working-directory: ./wolfssh/
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install valgrind
-          touch sshd_config.txt
-          ./configure --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 -DMAX_PATH_SZ=120" --enable-static --disable-shared && make
-          sudo timeout --preserve-status -s 2 5 valgrind --error-exitcode=1 --leak-check=full ./apps/wolfsshd/wolfsshd -D -f sshd_config -h ./keys/server-key.pem -d -p 22222
-
-      - name: configure with debug
-        working-directory: ./wolfssh/
-        run : |
-          ./configure --enable-all --enable-debug 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 -DMAX_PATH_SZ=120"
-
-      - name: make
-        working-directory: ./wolfssh/
-        run: make
-
-      # ssh_kex_algos.sh requires debug output otherwise it is skipped
-      - name: Run wolfSSHd tests with debug
-        working-directory: ./wolfssh/apps/wolfsshd/test
-        run: |
-          git log -3
-          sudo ./run_all_sshd_tests.sh --match ssh_kex_algos.sh
-
+    - uses: actions/checkout@v2
+      with:
+          repository: wolfSSL/wolfssl.git
+          ref: master
+    - name: build wolfSSL
+      run: ./autogen.sh && ./configure --enable-all --prefix=/usr && make && sudo make install
+    - uses: actions/checkout@v2
+    - name: autogen
+      run: ./autogen.sh
+    - name: configure
+      run: ./configure --enable-all CPPFLAGS="-DWOLFSSH_NO_FPKI -DWOLFSSH_NO_SFTP_TIMEOUT -DWOLFSSH_MAX_SFTP_RW=4000000"
+    - name: make
+      run: make
+    - name: make check
+      run: make check
+    - name: run wolfSSHd tests
+      run: sudo ./run_all_sshd_tests.sh root
+      working-directory: ./apps/wolfsshd/test

.github/workflows/windows-check.yml

@@ -23,7 +23,6 @@ env:
 
 jobs:
   build:
-    if: github.repository_owner == 'wolfssl'
     runs-on: windows-latest
 
     steps:

.github/workflows/zephyr.yml

@@ -14,7 +14,7 @@ jobs:
         config:
           - zephyr-ref: v3.4.0
             zephyr-sdk: 0.16.1
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     # This should be a safe limit for the tests to run.
     timeout-minutes: 20
     steps:
@@ -87,7 +87,7 @@ jobs:
 
       - name: Upload failure logs
         if: ${{ failure() && steps.wolfssh-test.outcome == 'failure' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: zephyr-client-test-logs
           path: logs.zip