Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bind9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Bind9 Tests
# START OF COMMON SECTION
on:
push:
branches: [ 'master', 'main', 'release/**' ]
branches: [ '*' ] #master', 'main', 'release/**' ]
pull_request:
branches: [ '*' ]

Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/build-wolfprovider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions debian/install-wolfssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading