diff --git a/.github/workflows/bind9.yml b/.github/workflows/bind9.yml index e37eb4dc..0fb1fb1c 100644 --- a/.github/workflows/bind9.yml +++ b/.github/workflows/bind9.yml @@ -3,7 +3,7 @@ name: Bind9 Tests # START OF COMMON SECTION on: push: - branches: [ 'master', 'main', 'release/**' ] + branches: [ '*' ] #master', 'main', 'release/**' ] pull_request: branches: [ '*' ] diff --git a/.github/workflows/build-wolfprovider.yml b/.github/workflows/build-wolfprovider.yml index f2316da3..49a8ebdf 100644 --- a/.github/workflows/build-wolfprovider.yml +++ b/.github/workflows/build-wolfprovider.yml @@ -115,21 +115,21 @@ jobs: # ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} # apt install --reinstall -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*wolfssl*.deb - # # TODO: roll this step into utils-wolfssl.sh - # # TODO: specify tag below - # - 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 }} - - # 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 + # TODO: roll this step into utils-wolfssl.sh + # TODO: specify tag below + - 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 }} + + # # 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 # 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..6e3624d6 100755 --- a/debian/install-wolfssl.sh +++ b/debian/install-wolfssl.sh @@ -117,9 +117,9 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac fi # Patch debian/rules.in to disable dh_strip - echo "Patching debian/rules.in to disable dh_strip..." - sed -i 's/^[[:space:]]*dh_strip.*/:/' debian/rules.in - echo "debian/rules.in patched successfully" + # echo "Patching debian/rules.in to disable dh_strip..." + # sed -i 's/^[[:space:]]*dh_strip.*/:/' debian/rules.in + # echo "debian/rules.in patched successfully" else echo "debian/rules.in found, using existing debian packaging"