Actions: Fix dominates() false positive in reusable workflows #21986
+226
−1
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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| category: fix | ||
| --- | ||
| * GitHub Actions support for reusable workflows was improved. | ||
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,17 @@ | ||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| COMMIT_SHA: | ||
| type: string | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v6 | ||
| with: | ||
| ref: ${{ inputs.COMMIT_SHA }} | ||
| - run: | | ||
| npm install | ||
| npm run lint | ||
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,13 @@ | ||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| COMMIT_SHA: | ||
| type: string | ||
|
|
||
| jobs: | ||
| build: | ||
| uses: TestOrg/TestRepo/.github/workflows/build.yml@main | ||
| with: | ||
| COMMIT_SHA: ${{ inputs.COMMIT_SHA }} | ||
|
|
||
|
|
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,31 @@ | ||
| on: | ||
| pull_request_target: | ||
|
|
||
| jobs: | ||
| is-collaborator: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Get User Permission | ||
| id: checkAccess | ||
| uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b | ||
| with: | ||
| require: write | ||
| username: ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Check User Permission | ||
| if: steps.checkAccess.outputs.require-result == 'false' | ||
| run: | | ||
| echo "${{ github.actor }} does not have permissions on this repo." | ||
| echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" | ||
| exit 1 | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| #needs: is-collaborator Mistake, doesn't wait for the collaborator - no security check | ||
| steps: | ||
| - name: Checkout repo | ||
| uses: actions/checkout@4 | ||
| with: | ||
| ref: ${{ github.event.pull_request.head.sha }} # should alert | ||
| fetch-depth: 2 | ||
| - run: yarn test |
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,26 @@ | ||
| on: | ||
| pull_request_target: | ||
|
|
||
| jobs: | ||
| is-collaborator: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Get User Permission | ||
| id: checkAccess | ||
| uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b | ||
| with: | ||
| require: write | ||
| username: ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Check User Permission | ||
| if: steps.checkAccess.outputs.require-result == 'false' | ||
| run: | | ||
| echo "${{ github.actor }} does not have permissions on this repo." | ||
| echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" | ||
| exit 1 | ||
| build: | ||
| needs: is-collaborator | ||
| uses: TestOrg/TestRepo/.github/workflows/build.yml@main | ||
|
Contributor
There was a problem hiding this comment. Could we also add a regression for the mixed-caller case? Something like this protected caller plus another job in the same triggering workflow that calls the same reusable workflow without That seems to be the tricky case here, because otherwise the reusable workflow node can look protected just because one of its callers is protected. |
||
| with: | ||
| COMMIT_SHA: ${{ github.event.pull_request.head.sha }} # shouldn't alert since permission check | ||
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,26 @@ | ||
| on: | ||
| pull_request_target: | ||
|
|
||
| jobs: | ||
| is-collaborator: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Get User Permission | ||
| id: checkAccess | ||
| uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b | ||
| with: | ||
| require: write | ||
| username: ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Check User Permission | ||
| if: steps.checkAccess.outputs.require-result == 'false' | ||
| run: | | ||
| echo "${{ github.actor }} does not have permissions on this repo." | ||
| echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" | ||
| exit 1 | ||
| build: | ||
| needs: is-collaborator | ||
| uses: TestOrg/TestRepo/.github/workflows/build_nested.yml@main | ||
| with: | ||
| COMMIT_SHA: ${{ github.event.pull_request.head.sha }} # shouldn't alert since permission check |
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,26 @@ | ||
| on: | ||
| pull_request_target: | ||
|
|
||
| jobs: | ||
| is-collaborator: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Get User Permission | ||
| id: checkAccess | ||
| uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b | ||
| with: | ||
| require: write | ||
| username: ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Check User Permission | ||
| if: steps.checkAccess.outputs.require-result == 'false' | ||
| run: | | ||
| echo "${{ github.actor }} does not have permissions on this repo." | ||
| echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" | ||
| exit 1 | ||
| build: | ||
| # needs: is-collaborator | ||
| uses: TestOrg/TestRepo/.github/workflows/build_nested.yml@main | ||
| with: | ||
| COMMIT_SHA: ${{ github.event.pull_request.head.sha }} |
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,31 @@ | ||
| on: | ||
| pull_request_target: | ||
|
|
||
| jobs: | ||
| is-collaborator: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Get User Permission | ||
| id: checkAccess | ||
| uses: actions-cool/check-user-permission@cd622002ff25c2311d2e7fb82107c0d24be83f9b | ||
| with: | ||
| require: write | ||
| username: ${{ github.actor }} | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Check User Permission | ||
| if: steps.checkAccess.outputs.require-result == 'false' | ||
| run: | | ||
| echo "${{ github.actor }} does not have permissions on this repo." | ||
| echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" | ||
| exit 1 | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| needs: is-collaborator | ||
| steps: | ||
| - name: Checkout repo | ||
| uses: actions/checkout@4 | ||
| with: | ||
| ref: ${{ github.event.pull_request.head.sha }} # shouldn't alert since permission check | ||
| fetch-depth: 2 | ||
| - run: yarn test |
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.
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.
nit: maybe we could make this a little tighter? This sounds like a general reusable-workflow support improvement, while the change is more specifically about recognizing control checks around jobs that call reusable workflows.
Maybe something like: