-
Notifications
You must be signed in to change notification settings - Fork 0
[RELEASE] Promote dev to main #213
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.
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
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
c75a283
docs: post-release documentation update for v1.2.0 (#125)
mpaulosky 6352f91
fix(docs): address Aragorn review blockers — PR #126
mpaulosky 566c642
ci: add workflow_dispatch to squad-mark-released.yml
mpaulosky b79a12e
docs: add Squad Commands quick reference guide (#130)
mpaulosky 475185e
docs: add Review PR shorthand command to Squad Commands (#133)
mpaulosky e7035b1
sprint(6): merge Sprint 6 — Code Quality (#160)
mpaulosky 29415ad
sprint(7): merge Sprint 7 — xUnit v3 Pilot (Domain.Tests) (#8) (#175)
mpaulosky 1039df8
Sprint 8 retrospective (#181) (#187)
mpaulosky f47fc70
fix: restore orphaned Unit.Tests coverage by migrating to Web.Tests (…
mpaulosky dc7e33e
logs: Sprint 9 kickoff — team readiness and phase timeline
6e6370c
test(Web.Tests): migrate to xUnit v3, fix headers, add AAA pattern, f…
b5e6c96
docs(squad): update Gimli history for Sprint 9 Web.Tests xUnit v3 mig…
24c9b6e
test(Web.Tests): migrate to xUnit v3 — headers, AAA, indentation (#190)
mpaulosky ffb3912
[Sprint 10] Migrate Web.Tests.Bunit to xUnit v3
mpaulosky 2b8a17e
test(integration): migrate Web.Tests.Integration to xUnit v3 (#200)
mpaulosky dc2235c
chore(deps): bump dotnet-sdk from 10.0.202 to 10.0.203 in the all-act…
dependabot[bot] a8a2b35
chore(deps): bump the all-actions group with 5 updates (#197)
dependabot[bot] 5e8e658
chore(deps): bump the all-actions group with 6 updates (#198)
dependabot[bot] 14dc27b
sprint(12): merge Sprint 12 — xUnit v3 (AppHost.Tests)
mpaulosky 4ac82b8
sprint(13): merge sprint 13 — xUnit v3 cleanup & docs (#14)
mpaulosky 907d862
Merge main into dev for Sprint 13 release prep
f28ac3e
Fix Gimli history numbering in PR 212
02cf370
merge(release): reconcile main into dev before Sprint 13 release (#212)
mpaulosky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| name: Dependabot Auto-Merge | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
| - reopened | ||
| - synchronize | ||
| - ready_for_review | ||
| branches: | ||
| - dev | ||
| push: | ||
| branches: | ||
| - dev | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| concurrency: | ||
| group: dependabot-auto-merge-${{ github.event.pull_request.number || github.ref_name || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| enable-auto-merge: | ||
| name: Enable auto-merge on Dependabot PRs | ||
| if: >- | ||
| github.event_name == 'pull_request_target' && | ||
| github.event.pull_request.user.login == 'dependabot[bot]' && | ||
| github.event.pull_request.base.ref == 'dev' && | ||
| github.event.pull_request.draft == false | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Enable auto-merge | ||
| uses: actions/github-script@v8 | ||
| with: | ||
| script: | | ||
| const pullRequestId = context.payload.pull_request.node_id; | ||
| const pullNumber = context.payload.pull_request.number; | ||
|
|
||
| try { | ||
| await github.graphql( | ||
| ` | ||
| mutation EnableAutoMerge($pullRequestId: ID!) { | ||
| enablePullRequestAutoMerge( | ||
| input: { | ||
| pullRequestId: $pullRequestId | ||
| mergeMethod: SQUASH | ||
| } | ||
| ) { | ||
| pullRequest { | ||
| number | ||
| } | ||
| } | ||
| } | ||
| `, | ||
| { pullRequestId } | ||
| ); | ||
|
|
||
| core.info(`Enabled auto-merge for PR #${pullNumber}.`); | ||
| } catch (error) { | ||
| const message = error.message ?? String(error); | ||
| if (message.includes('already enabled')) { | ||
| core.info(`Auto-merge is already enabled for PR #${pullNumber}.`); | ||
| return; | ||
| } | ||
|
|
||
| throw error; | ||
| } | ||
|
|
||
| refresh-open-prs: | ||
| name: Refresh open Dependabot PR branches | ||
| if: github.event_name != 'pull_request_target' | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Update open Dependabot PRs | ||
| uses: actions/github-script@v8 | ||
| with: | ||
| script: | | ||
| const owner = context.repo.owner; | ||
| const repo = context.repo.repo; | ||
|
|
||
| const openPullRequests = await github.paginate( | ||
| github.rest.pulls.list, | ||
| { | ||
| owner, | ||
| repo, | ||
| state: 'open', | ||
| base: 'dev', | ||
| per_page: 100, | ||
| } | ||
| ); | ||
|
|
||
| const dependabotPullRequests = openPullRequests.filter( | ||
| pullRequest => | ||
| pullRequest.user?.login === 'dependabot[bot]' && | ||
| pullRequest.draft === false | ||
| ); | ||
|
|
||
| if (dependabotPullRequests.length === 0) { | ||
| core.info('No open Dependabot PRs target dev.'); | ||
| return; | ||
| } | ||
|
|
||
| for (const pullRequest of dependabotPullRequests) { | ||
| try { | ||
| await github.rest.pulls.updateBranch({ | ||
| owner, | ||
| repo, | ||
| pull_number: pullRequest.number, | ||
| }); | ||
|
|
||
| core.info(`Queued branch update for PR #${pullRequest.number}.`); | ||
| } catch (error) { | ||
| if (error.status === 409 || error.status === 422) { | ||
| core.info( | ||
| `No branch update queued for PR #${pullRequest.number}: ${error.message}` | ||
| ); | ||
| } else { | ||
| throw error; | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| await github.graphql( | ||
| ` | ||
| mutation EnableAutoMerge($pullRequestId: ID!) { | ||
| enablePullRequestAutoMerge( | ||
| input: { | ||
| pullRequestId: $pullRequestId | ||
| mergeMethod: SQUASH | ||
| } | ||
| ) { | ||
| pullRequest { | ||
| number | ||
| } | ||
| } | ||
| } | ||
| `, | ||
| { pullRequestId: pullRequest.node_id } | ||
| ); | ||
|
|
||
| core.info(`Ensured auto-merge for PR #${pullRequest.number}.`); | ||
| } catch (error) { | ||
| const message = error.message ?? String(error); | ||
| if (message.includes('already enabled')) { | ||
| core.info(`Auto-merge already enabled for PR #${pullRequest.number}.`); | ||
| } else { | ||
| core.warning(`Could not enable auto-merge for PR #${pullRequest.number}: ${message}`); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This workflow uses
actions/github-script@v8, but the rest of the repo's workflows standardize onactions/github-script@v9. Please bump to@v9here as well to stay consistent and pick up the latest fixes/security updates.