Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update *.sha256 files when merging develop into stable #1859

Merged
merged 2 commits into from
Aug 13, 2022
Merged

Update *.sha256 files when merging develop into stable #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20f33c
Update `*.sha256` files when merging develop into stable
s0undt3ch Aug 13, 2022
6a41cea
The main job should also set the exit status
s0undt3ch Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ jobs:
run: |
echo "::set-output name=run-tests::${{ steps.changed-files.outputs.any_modified }}"

- name: Set Exit Status
if: always()
run: |
mkdir exitstatus
echo "${{ job.status }}" > exitstatus/${{ github.job }}

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@v3
with:
name: exitstatus
path: exitstatus

generate-actions-workflow:
name: Generate The Actions Workflow
runs-on: ubuntu-latest
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:

- name: Merge develop into stable
run: |
git merge --no-ff -m "Merge develop into stable" origin/develop || touch .git-conflicts
git merge --no-ff -m "Merge develop into stable for ${CUT_RELEASE_VERSION} release" origin/develop || touch .git-conflicts
if [ -f .git-conflicts ]
then
git diff
Expand All @@ -122,7 +122,7 @@ jobs:
pre-commit run -av --files $f
git add $f
done
git commit -a -m "Merge develop into stable(auto resolving conflicts to the develop version)"
git commit -a -m "Merge develop into stable for ${CUT_RELEASE_VERSION} release(auto resolving conflicts to the develop version)"
fi

- name: Tag Release
Expand All @@ -133,6 +133,12 @@ jobs:
tag_prefix: ""
create_annotated_tag: true

- name: Update bootstrap-salt.sh sha256sum's
run: |
echo "$(sha256sum bootstrap-salt.sh | awk '{ print $1 }')" > bootstrap-salt.sh.sha256
echo "$(sha256sum bootstrap-salt.ps1 | awk '{ print $1 }')" > bootstrap-salt.ps1.sha256
git commmit -a -m "Update sha256 checksums" || git commmit -a -m "Update sha256 checksums"

- name: Push Changes
uses: ad-m/github-push-action@master
with:
Expand Down Expand Up @@ -177,7 +183,9 @@ jobs:
generate_release_notes: false
files: |
bootstrap-salt.sh
bootstrap-salt.sh.sha256
bootstrap-salt.ps1
bootstrap-salt.ps1.sha256
LICENSE

- name: Delete Release Details Artifact
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/templates/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ jobs:
run: |
echo "::set-output name=run-tests::${{ steps.changed-files.outputs.any_modified }}"

- name: Set Exit Status
if: always()
run: |
mkdir exitstatus
echo "${{ job.status }}" > exitstatus/${{ github.job }}

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@v3
with:
name: exitstatus
path: exitstatus

generate-actions-workflow:
name: Generate The Actions Workflow
runs-on: ubuntu-latest
Expand Down