Skip to content

Commit 2aff24f

Browse files
authored
Merge pull request github#17413 from github/repo-sync
repo sync
2 parents c041b8d + 93d7c87 commit 2aff24f

18 files changed

+682
-111
lines changed

content/actions/using-workflows/reusing-workflows.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,8 @@ You can define inputs and secrets, which can be passed from the caller workflow
103103
required: true
104104
```
105105
{% endraw %}
106-
{% if actions-inherit-secrets-reusable-workflows %}
107-
For details of the syntax for defining inputs and secrets, see [`on.workflow_call.inputs`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callinputs), [`on.workflow_call.secrets`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callsecrets) and [`on.workflow_call.secrets.inherit`](/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callsecretsinherit).
108-
1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step. If the secrets are inherited using `secrets: inherit`, you can reference them even if they are not defined in the `on` key.
109-
{%else%}
110106
For details of the syntax for defining inputs and secrets, see [`on.workflow_call.inputs`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callinputs) and [`on.workflow_call.secrets`](/actions/reference/workflow-syntax-for-github-actions#onworkflow_callsecrets).
111-
1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step.
112-
{%endif%}
107+
1. In the reusable workflow, reference the input or secret that you defined in the `on` key in the previous step.
113108

114109
{% raw %}
115110
```yaml
@@ -194,7 +189,6 @@ When you call a reusable workflow, you can only use the following keywords in th
194189
* [`jobs.<job_id>.with.<input_id>`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idwithinput_id)
195190
* [`jobs.<job_id>.secrets`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idsecrets)
196191
* [`jobs.<job_id>.secrets.<secret_id>`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idsecretssecret_id)
197-
{% if actions-inherit-secrets-reusable-workflows %}* [`jobs.<job_id>.secrets.inherit`](/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callsecretsinherit){% endif %}
198192
* [`jobs.<job_id>.needs`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds)
199193
* [`jobs.<job_id>.if`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif)
200194
* [`jobs.<job_id>.permissions`](/actions/reference/workflow-syntax-for-github-actions#jobsjob_idpermissions)

content/actions/using-workflows/workflow-syntax-for-github-actions.md

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -157,42 +157,6 @@ jobs:
157157
```
158158
{% endraw %}
159159

160-
{% if actions-inherit-secrets-reusable-workflows %}
161-
162-
#### `on.workflow_call.secrets.inherit`
163-
164-
Use the `inherit` keyword to pass all the calling workflow's secrets to the called workflow. This includes all secrets the calling workflow has access to, namely organization, repository, and environment secrets. The `inherit` keyword can be used to pass secrets across repositories within the same organization, or across organizations within the same enterprise.
165-
166-
#### Example
167-
168-
{% raw %}
169-
170-
```yaml
171-
on:
172-
workflow_dispatch:
173-
174-
jobs:
175-
pass-secrets-to-workflow:
176-
uses: ./.github/workflows/called-workflow.yml
177-
secrets: inherit
178-
```
179-
180-
```yaml
181-
on:
182-
workflow_call:
183-
184-
jobs:
185-
pass-secret-to-action:
186-
runs-on: ubuntu-latest
187-
steps:
188-
- name: Use a repo or org secret from the calling workflow.
189-
uses: echo ${{ secrets.CALLING_WORKFLOW_SECRET }}
190-
```
191-
192-
{% endraw %}
193-
194-
{%endif%}
195-
196160
#### `on.workflow_call.secrets.<secret_id>`
197161

198162
A string identifier to associate with the secret.

data/features/actions-inherit-secrets-reusable-workflows.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

data/reusables/actions/pass-inputs-to-reusable-workflows.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,3 @@ jobs:
1111
envPAT: ${{ secrets.envPAT }}
1212
```
1313
{% endraw %}
14-
15-
{% if actions-inherit-secrets-reusable-workflows %}
16-
Workflows that call reusable workflows in the same organization or enterprise can use the `inherit` keyword to implicitly pass the secrets.
17-
18-
{% raw %}
19-
```yaml
20-
jobs:
21-
call-workflow-passing-data:
22-
uses: octo-org/example-repo/.github/workflows/reusable-workflow.yml@main
23-
with:
24-
username: mona
25-
secrets: inherit
26-
```
27-
{% endraw %}
28-
29-
{%endif%}

lib/redirects/static/client-side-rest-api-redirects.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@
188188
"/rest/actions#disable-a-selected-organization-for-github-actions-in-an-enterprise": "/rest/actions/permissions#disable-a-selected-organization-for-github-actions-in-an-enterprise",
189189
"/rest/actions#get-allowed-actions-for-an-enterprise": "/rest/actions/permissions#get-allowed-actions-for-an-enterprise",
190190
"/rest/actions#set-allowed-actions-for-an-enterprise": "/rest/actions/permissions#set-allowed-actions-for-an-enterprise",
191+
"/rest/actions#get-default-workflow-permissions-for-an-enterprise": "/rest/actions/permissions#get-default-workflow-permissions-for-an-enterprise",
192+
"/rest/actions#set-default-workflow-permissions-for-an-enterprise": "/rest/actions/permissions#set-default-workflow-permissions-for-an-enterprise",
191193
"/rest/actions#list-self-hosted-runner-groups-for-an-enterprise": "/rest/actions/self-hosted-runner-groups#list-self-hosted-runner-groups-for-an-enterprise",
192194
"/rest/actions#self-hosted-runner-groups": "/rest/actions/self-hosted-runner-groups",
193195
"/rest/actions#create-self-hosted-runner-group-for-an-enterprise": "/rest/actions/self-hosted-runner-groups#create-self-hosted-runner-group-for-an-enterprise",
@@ -469,6 +471,8 @@
469471
"/rest/actions#set-workflow-access-to-a-repository": "/rest/actions/permissions#set-workflow-access-to-a-repository",
470472
"/rest/actions#get-allowed-actions-for-a-repository": "/rest/actions/permissions#get-allowed-actions-for-a-repository",
471473
"/rest/actions#set-allowed-actions-for-a-repository": "/rest/actions/permissions#set-allowed-actions-for-a-repository",
474+
"/rest/actions#get-default-workflow-permissions-for-a-repository": "/rest/actions/permissions#get-default-workflow-permissions-for-a-repository",
475+
"/rest/actions#set-default-workflow-permissions-for-a-repository": "/rest/actions/permissions#set-default-workflow-permissions-for-a-repository",
472476
"/rest/actions#list-self-hosted-runners-for-a-repository": "/rest/actions/self-hosted-runners#list-self-hosted-runners-for-a-repository",
473477
"/rest/actions#list-runner-applications-for-a-repository": "/rest/actions/self-hosted-runners#list-runner-applications-for-a-repository",
474478
"/rest/actions#create-a-registration-token-for-a-repository": "/rest/actions/self-hosted-runners#create-a-registration-token-for-a-repository",

lib/rest/static/apps/enabled-for-apps.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
"verb": "get",
66
"requestPath": "/enterprises/{enterprise}/actions/cache/usage"
77
},
8+
{
9+
"verb": "get",
10+
"requestPath": "/enterprises/{enterprise}/actions/permissions/workflow"
11+
},
12+
{
13+
"verb": "put",
14+
"requestPath": "/enterprises/{enterprise}/actions/permissions/workflow"
15+
},
816
{
917
"verb": "get",
1018
"requestPath": "/orgs/{org}/actions/cache/usage"
@@ -241,6 +249,14 @@
241249
"verb": "put",
242250
"requestPath": "/repos/{owner}/{repo}/actions/permissions/selected-actions"
243251
},
252+
{
253+
"verb": "get",
254+
"requestPath": "/repos/{owner}/{repo}/actions/permissions/workflow"
255+
},
256+
{
257+
"verb": "put",
258+
"requestPath": "/repos/{owner}/{repo}/actions/permissions/workflow"
259+
},
244260
{
245261
"verb": "get",
246262
"requestPath": "/repos/{owner}/{repo}/actions/runners"

0 commit comments

Comments
 (0)