Skip to content

Commit 74fc187

Browse files
authored
Merge pull request #39607 from github/repo-sync
Repo sync
2 parents 77e2396 + 6efaaf8 commit 74fc187

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

content/actions/how-tos/secure-your-work/security-harden-deployments/oidc-in-jfrog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ In your {% data variables.product.prodname_actions %} workflow file, ensure you
5555

5656
The following example uses the placeholders `YOUR_PROVIDER_NAME` and `YOUR_AUDIENCE`.
5757

58+
{% raw %}
59+
5860
```yaml
5961
permissions:
6062
id-token: write
@@ -77,13 +79,17 @@ jobs:
7779

7880
```
7981

82+
{% endraw %}
83+
8084
> [!TIP]
8185
> When OIDC authentication is used, the `setup-jfrog-cli` action automatically provides `oidc-user` and `oidc-token` as step outputs.
8286
> These can be used for other integrations that require authentication with JFrog.
8387
> To reference these outputs, ensure the step has an explicit `id` defined (for example `id: setup-jfrog-cli`).
8488
8589
### Using OIDC Credentials in other steps
8690

91+
{% raw %}
92+
8793
```yaml
8894
- name: Sign in to Artifactory Docker registry
8995
uses: docker/login-action@v3
@@ -93,6 +99,8 @@ jobs:
9399
password: ${{ steps.setup-jfrog-cli.outputs.oidc-token }}
94100
```
95101
102+
{% endraw %}
103+
96104
## Further reading
97105
98106
* [OpenID Connect Integration](https://jfrog.com/help/r/jfrog-platform-administration-documentation/openid-connect-integration) in the JFrog documentation

data/reusables/organizations/additional-permissions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ For more information, see [AUTOTITLE](/discussions).
5959
* View {% data variables.product.prodname_secret_scanning %} results
6060
* Dismiss or reopen {% data variables.product.prodname_secret_scanning %} results
6161

62+
{%- ifversion ghec %}
6263
### Actions
6364

6465
* Manage {% data variables.product.prodname_actions %} general settings
6566
* Manage runners
6667
* Manage secrets
6768
* Manage variables
6869
* Manage environments (including environment secrets and variables)
70+
{%- endif %}

data/reusables/repositories/rulesets-bypass-step.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ You can grant certain roles, teams, or apps bypass permissions {% ifversion push
22

33
* Repository admins, organization owners, and enterprise owners
44
* The maintain or write role, or custom repository roles based on the write role
5-
* Teams
5+
* Teams, excluding secret teams. See [AUTOTITLE](/organizations/organizing-members-into-teams/about-teams#team-visibility).
66
{%- ifversion ghes %}
77
* Deploy keys
88
{%- endif %}

0 commit comments

Comments
 (0)