From 9f9d624bc85a862beaa623ec14b0bee750921031 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 21 Oct 2020 13:56:53 +0100 Subject: [PATCH 1/2] Split workflows --- .github/workflows/checksums.yml | 26 ++----------------- .github/workflows/release.yml | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/checksums.yml b/.github/workflows/checksums.yml index 6275435..1fed5fe 100644 --- a/.github/workflows/checksums.yml +++ b/.github/workflows/checksums.yml @@ -1,4 +1,4 @@ -name: Checksums +name: Scripts-Checksums on: push: @@ -7,7 +7,7 @@ on: jobs: checksums: - name: Update Release Checksums + name: Update Scripts Checksums runs-on: ubuntu-latest steps: @@ -34,25 +34,3 @@ jobs: with: commit-message: Update sha256 checksums delete-branch: true - - - uses: actions/checkout@v2 - if: github.repository == 'saltstack/salt-bootstrap' - with: - ref: develop - - - name: Set up Python 3.7 - if: github.repository == 'saltstack/salt-bootstrap' - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Update Latest Release on README - if: github.repository == 'saltstack/salt-bootstrap' - run: | - python3 .github/workflows/scripts/update-release-shasum.py ${{ env.BS_VERSION }} ${{ env.SH }} - - - 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..248d2bb --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,45 @@ +name: Release + +on: + push: + tags: + - '*' + +jobs: + checksums: + name: Update Release Checksums on Develop + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + if: github.repository == 'saltstack/salt-bootstrap' + with: + ref: stable + + - name: Get bootstrap-salt.sh sha256sum + if: github.repository == 'saltstack/salt-bootstrap' + run: | + echo "SH=$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" >> $GITHUB_ENV + echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> $GITHUB_ENV + + - uses: actions/checkout@v2 + if: github.repository == 'saltstack/salt-bootstrap' + with: + ref: develop + + - name: Set up Python 3.7 + if: github.repository == 'saltstack/salt-bootstrap' + uses: actions/setup-python@v1 + with: + python-version: 3.7 + + - name: Update Latest Release on README + if: github.repository == 'saltstack/salt-bootstrap' + run: | + python3 .github/workflows/scripts/update-release-shasum.py ${{ env.BS_VERSION }} ${{ env.SH }} + + - name: Create Pull Request Against Develop + uses: peter-evans/create-pull-request@v3 + with: + commit-message: Update README.rst with ${{ env.BS_VERSION }} release sha256sum + delete-branch: true From aabe9ba5df4bfbb89d9b4b4768d69ddfc61e8cc8 Mon Sep 17 00:00:00 2001 From: s0undt3ch Date: Wed, 21 Oct 2020 13:24:18 +0000 Subject: [PATCH 2/2] Update README.rst with latest release sha256sum --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 7266332..903ecb0 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.20: ``b47bfc8d63cccf22eb4cd94491d30cc1d571e184be25a5be7f775e7f2daaf6e2`` - 2020.10.19: ``f6c3e2c52f98d115809044b09062219369957caf30228b594033f0543e202c52`` - 2020.06.23: ``1d07db867c195c864d0ae70664524f2099cc9a46872953293c67c3f239d4f4f5`` - 2020.05.28: ``6b3ea15c78f01060ab12fc01c0bb18480eaf36858c7ba188b200c0fb11aac173``