add success message to GPG import

tegonal · May 1, 2023 · 690ac7d · 690ac7d
1 parent 04f2249
commit 690ac7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/gt-update.yml b/.github/workflows/gt-update.yml
@@ -24,7 +24,7 @@ jobs:
             || (echo "could not import GPG keys via vars.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
           false || gpg --import - <<< "${{ secrets.PUBLIC_GPG_KEYS_WE_TRUST }}" && success=true \
             || (echo "could not import GPG keys via secrets.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
-          false || "${success:-false}"
+          false || "${success:-false}" && echo "was able to import GPGs either via vars or secrets (or via both -- see above)"
       - uses: actions/checkout@v3
       - name: Install gt
         run: |
@@ -53,7 +53,7 @@ jobs:
       - name: git status
         run: git status
       - name: Create pull request if necessary
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v4
         with:
           branch: gt/update
           base: main

diff --git a/.github/workflows/installation.yml b/.github/workflows/installation.yml
@@ -16,7 +16,7 @@ jobs:
             || (echo "could not import GPG keys via vars.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
           false || gpg --import - <<< "${{ secrets.PUBLIC_GPG_KEYS_WE_TRUST }}" && success=true \
             || (echo "could not import GPG keys via secrets.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
-          false || "${success:-false}"
+          false || "${success:-false}" && echo "was able to import GPGs either via vars or secrets (or via both -- see above)"
       - uses: actions/checkout@v3
       - name: Check it works
         run: |
@@ -38,7 +38,7 @@ jobs:
             || (echo "could not import GPG keys via vars.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
           false || gpg --import - <<< "${{ secrets.PUBLIC_GPG_KEYS_WE_TRUST }}" && success=true \
             || (echo "could not import GPG keys via secrets.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
-          false || "${success:-false}"
+          false || "${success:-false}" && echo "was able to import GPGs either via vars or secrets (or via both -- see above)"
       - uses: actions/checkout@v3
       - name: Check it works
         run: ./install.doc.sh
@@ -58,7 +58,7 @@ jobs:
             || (echo "could not import GPG keys via vars.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
           false || gpg --import - <<< "${{ secrets.PUBLIC_GPG_KEYS_WE_TRUST }}" && success=true \
             || (echo "could not import GPG keys via secrets.PUBLIC_GPG_KEYS_WE_TRUST -- maybe it's not defined"; exit 1) && \
-          false || "${success:-false}"
+          false || "${success:-false}" && echo "was able to import GPGs either via vars or secrets (or via both -- see above)"
       - uses: actions/checkout@v3
       - name: install ${{ matrix.tag }}
         run: |