From 690ac7d12a8d3a354a2f0c9cbc00e19e4cd08ddd Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Mon, 1 May 2023 13:57:57 +0200 Subject: [PATCH] add success message to GPG import --- .github/workflows/gt-update.yml | 4 ++-- .github/workflows/installation.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gt-update.yml b/.github/workflows/gt-update.yml index e34c9ab..ba3a4af 100644 --- 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 index fa7712e..ac719ec 100644 --- 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: |