From 79fdee91602d5c5005125863f5a8e3ebaf24ac14 Mon Sep 17 00:00:00 2001 From: Justin Persaud Date: Thu, 19 Oct 2023 17:10:36 -0400 Subject: [PATCH 1/4] Add checkout to setup for OSBotify --- .github/actions/composite/setupGitForOSBotifyApp/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml index bd5b5139bc6b..d90adf609cd7 100644 --- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml +++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml @@ -24,6 +24,12 @@ outputs: runs: using: composite steps: + - name: Checkout + uses: actions/checkout@v3 + with: + sparse-checkout: | + .github + - name: Decrypt OSBotify GPG key run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase=${{ inputs.GPG_PASSPHRASE }} --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg shell: bash From 411b053119fd0f2f215d1bdfa60395125c603606 Mon Sep 17 00:00:00 2001 From: Justin Persaud Date: Thu, 19 Oct 2023 17:20:52 -0400 Subject: [PATCH 2/4] add step to check if gpg key is present --- .../actions/composite/setupGitForOSBotifyApp/action.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml index d90adf609cd7..8d48bf011696 100644 --- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml +++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml @@ -24,6 +24,14 @@ outputs: runs: using: composite steps: + - name: Check if gpg encrypted private key is present + shell: bash + run: | + if [ -f .github/workflows/OSBotify-private-key.asc.gpg ]; then + echo "::set-output name=key_exists::true" + else + echo "::set-output name=key_exists::false" + fi - name: Checkout uses: actions/checkout@v3 with: From f11a4630253a669c987beabc4b16c7a59951df4b Mon Sep 17 00:00:00 2001 From: Justin Persaud Date: Thu, 19 Oct 2023 17:25:06 -0400 Subject: [PATCH 3/4] add conditional to checkout --- .github/actions/composite/setupGitForOSBotifyApp/action.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml index 8d48bf011696..dea091d9c1bb 100644 --- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml +++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml @@ -25,15 +25,18 @@ runs: using: composite steps: - name: Check if gpg encrypted private key is present + id: key_check shell: bash run: | - if [ -f .github/workflows/OSBotify-private-key.asc.gpg ]; then + if [[ -f .github/workflows/OSBotify-private-key.asc.gpg ]]; then echo "::set-output name=key_exists::true" else echo "::set-output name=key_exists::false" fi + - name: Checkout uses: actions/checkout@v3 + if: steps.key_check.outputs.key_exists != 'true' with: sparse-checkout: | .github From 50456d6ab60dd241c6bcc100090ed2a34d97acb0 Mon Sep 17 00:00:00 2001 From: Justin Persaud Date: Thu, 19 Oct 2023 17:25:19 -0400 Subject: [PATCH 4/4] simplify check --- .github/actions/composite/setupGitForOSBotifyApp/action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml index dea091d9c1bb..9961893e03e5 100644 --- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml +++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml @@ -30,8 +30,6 @@ runs: run: | if [[ -f .github/workflows/OSBotify-private-key.asc.gpg ]]; then echo "::set-output name=key_exists::true" - else - echo "::set-output name=key_exists::false" fi - name: Checkout