Repository navigation
Develop #366
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
Develop #366
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
38484ba
Sync main / develop (#357)
ptr727 646e584
Add required secret for workflow token in codegen pull request task (…
ptr727 35f4472
Merge branch 'main' into develop
ptr727 c51bcee
Remove unnecessary condition for merging codegen pull requests in wor…
ptr727 f51c64c
Refine merge conditions for codegen pull requests and update workflow…
ptr727 e7a0669
Update merge conditions for codegen pull request and adjust permissio…
ptr727 6a72c71
Merge main into develop, resolving conflicts with develop changes
ptr727 2fb7989
Address Copilot review comments on PR #366
ptr727 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,58 @@ | ||
| name: Merge bot pull request action | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened, synchronize] | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
|
|
||
| merge-dependabot: | ||
| name: Merge dependabot pull request job | ||
| runs-on: ubuntu-latest | ||
| if: github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
|
|
||
| - name: Get dependabot metadata step | ||
| id: metadata | ||
| uses: dependabot/fetch-metadata@v2 | ||
| with: | ||
| github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
|
|
||
| - name: Merge pull request step | ||
| if: steps.metadata.outputs.update-type != 'version-update:semver-major' | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GH_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
|
|
||
| merge-codegen: | ||
| name: Merge codegen pull request job | ||
| runs-on: ubuntu-latest | ||
| if: github.actor == 'ptr727' && github.event.pull_request.user.login == 'ptr727' && github.event.pull_request.head.ref == 'codegen' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
|
|
||
| - name: Merge pull request step | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GH_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
| name: Merge bot pull request action | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened, synchronize] | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
|
|
||
| merge-dependabot: | ||
| name: Merge dependabot pull request job | ||
| runs-on: ubuntu-latest | ||
| if: github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
|
|
||
| - name: Get dependabot metadata step | ||
| id: metadata | ||
| uses: dependabot/fetch-metadata@v2 | ||
| with: | ||
| github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
|
|
||
| - name: Merge pull request step | ||
| if: steps.metadata.outputs.update-type != 'version-update:semver-major' | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GH_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
|
|
||
| merge-codegen: | ||
| name: Merge codegen pull request job | ||
| runs-on: ubuntu-latest | ||
| if: >- | ||
| github.event.pull_request.user.login == 'github-actions[bot]' && | ||
| github.event.pull_request.head.ref == 'codegen' && | ||
| github.event.pull_request.base.ref == 'main' && | ||
| github.event.pull_request.head.repo.full_name == github.repository && | ||
| ( | ||
| (github.event.action == 'reopened' && github.actor == github.repository_owner) || | ||
| (github.event.action != 'reopened' && github.actor == 'github-actions[bot]') | ||
| ) | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
|
|
||
| - name: Merge pull request step | ||
| run: gh pr merge --auto --squash "$PR_URL" | ||
| env: | ||
| PR_URL: ${{github.event.pull_request.html_url}} | ||
| GH_TOKEN: ${{secrets.GITHUB_TOKEN}} |
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 |
|---|---|---|
| @@ -1,49 +1,65 @@ | ||
| name: Run codegen and pull request task | ||
|
|
||
| on: | ||
| workflow_call: | ||
| secrets: | ||
| WORKFLOW_PAT: | ||
| required: true | ||
|
|
||
| jobs: | ||
|
|
||
| codegen: | ||
| name: Run codegen and pull request job | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
|
|
||
| - name: Setup .NET SDK step | ||
| uses: actions/setup-dotnet@v5 | ||
| with: | ||
| dotnet-version: 10.x | ||
|
|
||
| - name: Checkout code step | ||
| uses: actions/checkout@v6 | ||
| with: | ||
| ref: main | ||
|
|
||
| - name: Run codegen step | ||
| run: | | ||
| dotnet run --project ./CreateMatrix/CreateMatrix.csproj -- \ | ||
| matrix --versionpath=./Make/Version.json --matrixpath=./Make/Matrix.json --updateversion | ||
|
|
||
| - name: Format code step | ||
| run: | | ||
| dotnet tool restore | ||
| dotnet husky install | ||
| dotnet csharpier format --log-level=debug . | ||
| git status | ||
|
|
||
| - name: Create pull request step | ||
| uses: peter-evans/create-pull-request@v8 | ||
| with: | ||
| token: ${{ secrets.WORKFLOW_PAT }} | ||
| base: main | ||
| branch: codegen | ||
| title: 'Update codegen files' | ||
| body: 'This PR updates the codegen files.' | ||
| commit-message: 'Update codegen files' | ||
| delete-branch: true | ||
| sign-commits: true | ||
| name: Run codegen and pull request task | ||
|
|
||
| on: | ||
| workflow_call: | ||
| secrets: | ||
| # Least-privilege PAT used by `gh pr close/reopen` to re-trigger PR workflows. | ||
| # Grant only the minimum repository permissions needed to modify PR state | ||
| # (typically pull requests: write; contents: write only if your repo requires it). | ||
| WORKFLOW_PAT: | ||
| required: true | ||
|
|
||
| jobs: | ||
|
|
||
| codegen: | ||
| name: Run codegen and pull request job | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| steps: | ||
|
|
||
| - name: Setup .NET SDK step | ||
| uses: actions/setup-dotnet@v5 | ||
| with: | ||
| dotnet-version: 10.x | ||
|
|
||
| - name: Checkout code step | ||
| uses: actions/checkout@v6 | ||
| with: | ||
| ref: main | ||
|
|
||
| - name: Run codegen step | ||
| run: | | ||
| dotnet run --project ./CreateMatrix/CreateMatrix.csproj -- \ | ||
| matrix --versionpath=./Make/Version.json --matrixpath=./Make/Matrix.json --updateversion | ||
|
|
||
| - name: Format code step | ||
| run: | | ||
| dotnet tool restore | ||
| dotnet husky install | ||
| dotnet csharpier format --log-level=debug . | ||
| git status | ||
|
|
||
| - name: Create pull request step | ||
| uses: peter-evans/create-pull-request@v8 | ||
| id: cpr | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| base: main | ||
| branch: codegen | ||
| title: 'Update codegen files' | ||
| body: 'This PR updates the codegen files.' | ||
| commit-message: 'Update codegen files' | ||
| delete-branch: true | ||
| sign-commits: true | ||
|
|
||
| - name: Trigger PR workflows step | ||
| if: steps.cpr.outputs.pull-request-number != '' | ||
| run: | | ||
| PR="${{ steps.cpr.outputs.pull-request-number }}" | ||
| gh pr close "$PR" | ||
| gh pr reopen "$PR" | ||
| env: | ||
| GH_TOKEN: ${{ secrets.WORKFLOW_PAT }} | ||
|
ptr727 marked this conversation as resolved.
Resolved
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.