diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index f2316da3..ff255562 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -117,19 +117,19 @@ jobs: # # TODO: roll this step into utils-wolfssl.sh # # TODO: specify tag below - # - name: Build wolfSSL packages and install + - name: Build wolfSSL packages and install # # if: steps.wolfssl_cache.outputs.cache-hit != 'true' - # run: | - # # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }} - # $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} + run: | + $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }} +# # Unpack and install wolfSSL packages - - name: Unpack and install wolfSSL packages - run: | - mkdir -p ${{ env.WOLFSSL_PACKAGES_PATH }} - tar -xzf .github/packages/debian-wolfssl.tar.gz -C ${{ env.WOLFSSL_PACKAGES_PATH }} - mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }} - apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb + #- name: Unpack and install wolfSSL packages + # run: | + # mkdir -p ${{ env.WOLFSSL_PACKAGES_PATH }} + # tar -xzf .github/packages/debian-wolfssl.tar.gz -C ${{ env.WOLFSSL_PACKAGES_PATH }} + # mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }} + # apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb # Check for cached OpenSSL packages - name: Checking OpenSSL packages in cache diff --git a/debian/install-wolfssl.sh b/debian/install-wolfssl.sh index 7e280bac..afdc87f8 100755 --- a/debian/install-wolfssl.sh +++ b/debian/install-wolfssl.sh @@ -54,13 +54,15 @@ install_wolfssl_from_git() { echo "Cloning wolfSSL repository..." if [ -n "$git_tag" ]; then echo "Cloning specific tag/branch: $git_tag" - git clone https://github.com/wolfSSL/wolfssl + git clone https://github.com/LinuxJedi/wolfssl cd wolfssl - git checkout "$git_tag" + #git checkout "$git_tag" + git checkout fix-deb-builds else echo "Cloning master branch with depth 1" - git clone https://github.com/wolfSSL/wolfssl --depth 1 + git clone https://github.com/wolfssl/wolfssl cd wolfssl + git checkout v5.8.2-stable fi fi