From 4d2867c7fbf6acfb31601890f6f35f43acf16ea6 Mon Sep 17 00:00:00 2001 From: Brad Egler Date: Mon, 7 Nov 2022 10:24:33 -0500 Subject: [PATCH 1/2] fix: path to checksum file was incorrect --- .github/generate_version_checksums.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/generate_version_checksums.sh b/.github/generate_version_checksums.sh index b0bc5ff..6d42a34 100755 --- a/.github/generate_version_checksums.sh +++ b/.github/generate_version_checksums.sh @@ -5,7 +5,7 @@ cd temp || exit export GNUPGHOME=./.gnupg; -checksum_file=../../terraform-checksums.json +checksum_file=../terraform-checksums.json # Generate a temporary key to use for verification gpg --batch --quick-generate-key --batch --passphrase "" github-action@abcxyz.dev; From 4abf9c79221b6b6748f5e515cd692a2efa9617b0 Mon Sep 17 00:00:00 2001 From: Brad Egler Date: Mon, 7 Nov 2022 10:32:30 -0500 Subject: [PATCH 2/2] changed to be more explicit about the location of the checksum file to make this less brittle --- .github/generate_version_checksums.sh | 9 +++++++-- .github/workflows/update-checksums.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/generate_version_checksums.sh b/.github/generate_version_checksums.sh index 6d42a34..dc11bf2 100755 --- a/.github/generate_version_checksums.sh +++ b/.github/generate_version_checksums.sh @@ -1,12 +1,17 @@ #!/bin/sh +checksum_file=$1 +if [ "${checksum_file}" = "" ]; +then + echo "Usage: $0 "; + exit 1; +fi; + mkdir -p temp cd temp || exit export GNUPGHOME=./.gnupg; -checksum_file=../terraform-checksums.json - # Generate a temporary key to use for verification gpg --batch --quick-generate-key --batch --passphrase "" github-action@abcxyz.dev; diff --git a/.github/workflows/update-checksums.yml b/.github/workflows/update-checksums.yml index a105557..ea2a195 100644 --- a/.github/workflows/update-checksums.yml +++ b/.github/workflows/update-checksums.yml @@ -29,7 +29,7 @@ jobs: uses: 'actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8' # ratchet:actions/checkout@v3 # Generate updates to the checksum file if there are new released versions of terraform - id: 'generate-updates' - run: './.github/generate_version_checksums.sh;' + run: './.github/generate_version_checksums.sh $GITHUB_WORKSPACE/terraform-checksums.json;' # Create a pull request for review - id: 'create-pull-request' if: ${{ env.CHANGES }}