[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  ca6197ca3c1a18be004c447cf4bf5a1a40d7dd19 (commit)
      from  9ce2ef9ba084ec9548b6d219687b24590f87eb1b (commit)


- Log -----------------------------------------------------------------
commit ca6197ca3c1a18be004c447cf4bf5a1a40d7dd19
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu May 13 12:05:36 2021 +0200

    Ensure the pristine checksums are not recomputed
    
    When switching between the pristine and PR checkouts we must
    ensure the pristine checksums are not recomputed.
    
    Also ignore errors (such as trying to remove a label that
    is not set) when setting or removing labels.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15266)

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/checksums.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml
index 3b28d4e23b..5f444b639b 100644
--- a/.github/workflows/checksums.yml
+++ b/.github/workflows/checksums.yml
@@ -38,13 +38,14 @@ jobs:
         run: make fips-checksums
         working-directory: ./build
       - name: update checksums pristine
-        run: make update-fips-checksums
+        run: touch providers/fips.checksum.new && make update-fips-checksums
         working-directory: ./build-pristine
       - name: make diff-fips-checksums
         run: make diff-fips-checksums && echo "fips_unchanged=1" >> $GITHUB_ENV || echo "fips_changed=1" >> $GITHUB_ENV
         working-directory: ./build
       - name: set label
         if: ${{ env.fips_changed }}
+        continue-on-error: true
         uses: actions/github-script at v4
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
@@ -57,6 +58,7 @@ jobs:
             })
       - name: remove label
         if: ${{ env.fips_unchanged }}
+        continue-on-error: true
         uses: actions/github-script at v4
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}