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

Add all file modifications in a single commit #3355

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Add all file modifications in a single commit #3355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1103b5a
Add all file modifications in a single commit
michel-laterman Mar 13, 2024
0a7fbf5
Merge branch 'main' into post-dependabot-single-commit
michel-laterman Mar 13, 2024
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
34 changes: 10 additions & 24 deletions .github/workflows/post-dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,22 @@ jobs:
with:
go-version-file: .go-version

- name: run go mod tidy in testing/
run: cd testing; go mod tidy

- name: check for modified testing/go.mod or testing/go.sum
id: testing-mod-check
run: echo "modified=$(if git diff-index --quiet HEAD -- testing/go.mod testing/go.sum; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT

- name: commit testing/go.mod and testing/go.sum files
if: steps.testing-mod-check.outputs.modified == 'true'
run: |
git config --global user.name 'dependabot[bot]'
git config --global user.email 'dependabot[bot]@users.noreply.github.com'
git add testing/go.mod testing/go.sum
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git commit -m "Update testing/go.mod and testing/go.sum files"
git push

- name: update NOTICE.txt
run: make notice

- name: check for modified NOTICE.txt
id: notice-check
run: echo "modified=$(if git diff-index --quiet HEAD -- NOTICE.txt; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT
- name: run go mod tidy in testing/
run: cd testing; go mod tidy

- name: check for modified files
id: check-files
run: echo "modified=$(if git diff-index --quiet HEAD -- NOTICE.txt testing/go.mod testing/go.sum; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT

- name: commit NOTICE.txt
if: steps.notice-check.outputs.modified == 'true'
- name: commit modified files
if: steps.check-files.outputs.modified == 'true'
run: |
git config --global user.name 'dependabot[bot]'
git config --global user.email 'dependabot[bot]@users.noreply.github.com'
git add NOTICE.txt
git add NOTICE.txt testing/go.mod testing/go.sum
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git commit -m "Update NOTICE.txt"
git commit -m "Post dependabot file modifications"
git push
Loading