From c4654f04cff5d29cd3359b263c4bbdbf861dbd67 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 25 Apr 2024 11:25:56 +0100 Subject: [PATCH 1/3] Improve cacert upload check logic --- .github/workflows/cacert-publish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 4e7ff7f05..70c14b49d 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -45,9 +45,8 @@ jobs: run: | FILE=$(ls ca-certificates/debian/build/ospackage/*.deb) echo "File to upload: ${FILE}" - if jf rt s "deb/pool/main/a/adoptium-ca-certificates/$(basename $FILE)" > /dev/null; then - echo file_exists=true >> "$GITHUB_OUTPUT" - else + FILE_EXITS=$(jf rt s --count=true "deb/pool/main/a/adoptium-ca-certificates/$(basename $FILE)") + if [[ "$FILE_EXITS" == "0" ]]; then echo file_exists=false >> "$GITHUB_OUTPUT" fi From 69447e58e9e4ccdb9659c3b5ce7882b988b3bea6 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:48:21 +0100 Subject: [PATCH 2/3] Fix Typo Co-authored-by: Martijn Verburg --- .github/workflows/cacert-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 70c14b49d..5469f3171 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -45,7 +45,7 @@ jobs: run: | FILE=$(ls ca-certificates/debian/build/ospackage/*.deb) echo "File to upload: ${FILE}" - FILE_EXITS=$(jf rt s --count=true "deb/pool/main/a/adoptium-ca-certificates/$(basename $FILE)") + FILE_EXISTS=$(jf rt s --count=true "deb/pool/main/a/adoptium-ca-certificates/$(basename $FILE)") if [[ "$FILE_EXITS" == "0" ]]; then echo file_exists=false >> "$GITHUB_OUTPUT" fi From 315b4f341e46a070f2a7b5dd7bedcd5810f8d4f6 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:48:31 +0100 Subject: [PATCH 3/3] Fix typo Co-authored-by: Martijn Verburg --- .github/workflows/cacert-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 5469f3171..e73e94a22 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -46,7 +46,7 @@ jobs: FILE=$(ls ca-certificates/debian/build/ospackage/*.deb) echo "File to upload: ${FILE}" FILE_EXISTS=$(jf rt s --count=true "deb/pool/main/a/adoptium-ca-certificates/$(basename $FILE)") - if [[ "$FILE_EXITS" == "0" ]]; then + if [[ "$FILE_EXISTS" == "0" ]]; then echo file_exists=false >> "$GITHUB_OUTPUT" fi