From e208275fea39ee9f035fab8f950388d06555848a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 21 Oct 2020 13:35:06 +0100 Subject: [PATCH 1/3] GH Actions can't push to protected branches. Let's create PRs instead. --- .github/workflows/checksums.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml index 36c2edb..d0fc468 100644 --- a/.github/workflows/checksums.yml +++ b/.github/workflows/checksums.yml @@ -28,10 +28,12 @@ jobs: run: | echo ${{ env.SH }} > bootstrap-salt.sh.sha256 echo ${{ env.PS1 }} > bootstrap-salt.ps1.sha256 - git config --global user.name 'SaltStack GH Automation' - git config --global user.email 'actions@github.com' - git add *.sha256 - git commit -am "Update sha256 checksums" && git push || true + + - name: Create Pull Request Against Master + uses: peter-evans/create-pull-request@v3 + with: + commit-message: Update sha256 checksums + delete-branch: true - uses: actions/checkout@v2 if: github.repository == 'saltstack/salt-bootstrap' @@ -48,6 +50,9 @@ jobs: if: github.repository == 'saltstack/salt-bootstrap' run: | python3 .github/workflows/scripts/update-release-shasum.py ${{ env.BS_VERSION }} ${{ env.SH }} - git config --global user.name 'SaltStack GH Automation' - git config --global user.email 'actions@github.com' - git commit -am "Update README.rst with latest release sha256sum" && git push || true + + - name: Create Pull Request Against Develop + uses: peter-evans/create-pull-request@v3 + with: + commit-message: Update README.rst with latest release sha256sum + delete-branch: true From eb53b6e2b6932987120b3938d5f6254dd0feac66 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 21 Oct 2020 13:37:27 +0100 Subject: [PATCH 2/3] Add checksum for `2020.10.19` --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 71e92ab..7266332 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file. The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is: +- 2020.10.19: ``f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52`` - 2020.06.23: ``1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5`` - 2020.05.28: ``6b3ea15c78f01060ab12fc01c0bb18480eaf36858c7ba188b200c0fb11aac173`` - 2020.02.24: ``efc46700aca78b8e51d7af9b06293f52ad495f3a8179c6bfb21a8c97ee41f1b7`` From dbd7a335afb3cb962e33ea5606ed1a3c8ee35f68 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 21 Oct 2020 13:42:55 +0100 Subject: [PATCH 3/3] Run on pushes to stable and not on tag. So that the tag includes the updated checksums --- .github/workflows/checksums.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml index d0fc468..6275435 100644 --- a/.github/workflows/checksums.yml +++ b/.github/workflows/checksums.yml @@ -2,8 +2,8 @@ name: Checksums on: push: - tags: - - '*' + branches: + - stable jobs: checksums: