Skip to content

Commit 5367a8d

Browse files
authored
Merge branch 'main' into knewbury01/fix-606
2 parents 3187f2c + 29ade52 commit 5367a8d

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.github/actions/check-permissions/action.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@ runs:
1616
steps:
1717
- uses: actions/github-script@v7
1818
id: check-permission
19+
env:
20+
INPUT_MINIMUM-PERMISSION: ${{ inputs.minimum-permission }}
1921
with:
2022
script: |
2123
// Valid permissions are none, read, write, admin (legacy base permissions)
2224
const permissionsRanking = ["none", "read", "write", "admin"];
2325
26+
// Note: core.getInput doesn't work by default in a composite action - in this case
27+
// it would try to fetch the input to the github-script instead of the action
28+
// itself. Instead, we set the appropriate magic env var with the actions input.
29+
// See: https://github.com/actions/runner/issues/665
2430
const minimumPermission = core.getInput('minimum-permission');
2531
if (!permissionsRanking.includes(minimumPermission)) {
2632
core.setFailed(`Invalid minimum permission: ${minimumPermission}`);
@@ -30,14 +36,14 @@ runs:
3036
const { data : { permission : actorPermission } } = await github.rest.repos.getCollaboratorPermissionLevel({
3137
owner: context.repo.owner,
3238
repo: context.repo.repo,
33-
username: tools.context.actor
39+
username: context.actor
3440
});
3541
3642
// Confirm whether the actor permission is at least the selected permission
3743
const hasPermission = permissionsRanking.indexOf(minimumPermission) <= permissionsRanking.indexOf(actorPermission) ? "1" : "";
3844
core.setOutput('has-permission', hasPermission);
3945
if (!hasPermission) {
40-
core.info(`Current actor (${tools.context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
46+
core.info(`Current actor (${context.actor}) does not have the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
4147
} else {
42-
core.info(`Current actor (${tools.context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
43-
}
48+
core.info(`Current actor (${context.actor}) has the minimum required permission '${minimumPermission}' (has '${actorPermission}')`);
49+
}

.github/workflows/dispatch-matrix-check.yml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ jobs:
1111
dispatch-matrix-check:
1212
runs-on: ubuntu-22.04
1313
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
1417
- name: Check permission
1518
id: check-write-permission
1619
uses: ./.github/actions/check-permissions

.github/workflows/dispatch-matrix-test-on-comment.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
dispatch-matrix-check:
99
runs-on: ubuntu-22.04
1010
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v4
13+
1114
- name: Check permission
1215
id: check-write-permission
1316
uses: ./.github/actions/check-permissions

.github/workflows/dispatch-release-performance-check.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
dispatch-matrix-check:
99
runs-on: ubuntu-22.04
1010
steps:
11+
- name: Checkout repository
12+
uses: actions/checkout@v4
13+
1114
- name: Check permission
1215
id: check-write-permission
1316
uses: ./.github/actions/check-permissions

0 commit comments

Comments
 (0)