From ee91d8cb3c46951a51ac0a8aa7c7c3fb00b4d595 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 20 Jun 2023 19:40:02 -0400 Subject: [PATCH] Remove hardcoded keygrip in favour of repo var --- .github/workflows/ci-suite.yml | 1 + build/package/deb/build_package.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 951f2ede91..fbebbce6ae 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -896,6 +896,7 @@ jobs: - name: Execute Build Script env: + PACKAGING_KEYGRIP: ${{ vars.PACKAGING_KEYGRIP }} PACKAGING_PRIVATE_KEY_PASSPHRASE: ${{ secrets.PACKAGING_PRIVATE_KEY_PASSPHRASE }} run: sudo -E build/package/deb/build_package.sh diff --git a/build/package/deb/build_package.sh b/build/package/deb/build_package.sh index 442fe506db..54063487dc 100755 --- a/build/package/deb/build_package.sh +++ b/build/package/deb/build_package.sh @@ -42,10 +42,10 @@ rm -f /tmp/tgs_wrap_gpg_output.log set +e -if [[ -z "$PACKAGING_PRIVATE_KEY_PASSPHRASE" ]]; then +if [[ -z "$PACKAGING_KEYGRIP" ]]; then dpkg-buildpackage --no-sign else - dpkg-buildpackage --sign-key=ad03052d1740533e --sign-command="$SIGN_COMMAND" + dpkg-buildpackage --sign-key=$PACKAGING_KEYGRIP --sign-command="$SIGN_COMMAND" fi EXIT_CODE=$?