Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 09dffc0

Browse files
authoredNov 25, 2024··
Merge branch 'master' into master
2 parents 8f8b0ac + b6b01c2 commit 09dffc0

File tree

155 files changed

+492
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+492
-112
lines changed
 

‎.github/workflows/builddoc.yml

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222

2323
steps:
2424
- uses: actions/checkout@v4
25+
with:
26+
persist-credentials: false
2527
- name: Set up Python
2628
uses: actions/setup-python@v5
2729
with:

‎.github/workflows/create-release.yml

+15-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
id-token: write # for PyPI trusted publishing
2929
steps:
3030
- uses: actions/checkout@v4
31+
with:
32+
persist-credentials: false
3133
- name: Set up Python
3234
uses: actions/setup-python@v5
3335
with:
@@ -62,11 +64,15 @@ jobs:
6264
show-summary: "true"
6365

6466
- name: Convert attestations to PEP 740
65-
# workflow_ref example: sphinx-doc/sphinx/.github/workflows/create-release.yml@refs/heads/master
6667
run: >
6768
python utils/convert_attestations.py
68-
"${{ steps.attest.outputs.bundle-path }}"
69-
"https://github.com/${{ github.workflow_ref }}"
69+
"$BUNDLE_PATH"
70+
"$SIGNER_IDENTITY"
71+
env:
72+
BUNDLE_PATH: "${{ steps.attest.outputs.bundle-path }}"
73+
# workflow_ref example: sphinx-doc/sphinx/.github/workflows/create-release.yml@refs/heads/master
74+
# this forms the "signer identity" for the attestations
75+
SIGNER_IDENTITY: "https://github.com/${{ github.workflow_ref }}"
7076

7177
- name: Inspect PEP 740 attestations
7278
run: |
@@ -75,8 +81,10 @@ jobs:
7581
- name: Prepare attestation bundles for uploading
7682
run: |
7783
mkdir -p /tmp/attestation-bundles
78-
cp "${{ steps.attest.outputs.bundle-path }}" /tmp/attestation-bundles/
84+
cp "$BUNDLE_PATH" /tmp/attestation-bundles/
7985
cp dist/*.publish.attestation /tmp/attestation-bundles/
86+
env:
87+
BUNDLE_PATH: "${{ steps.attest.outputs.bundle-path }}"
8088

8189
- name: Upload attestation bundles
8290
uses: actions/upload-artifact@v4
@@ -97,7 +105,7 @@ jobs:
97105
headers: {Authorization: `bearer ${oidc_request_token}`},
98106
});
99107
const oidc_token = (await oidc_resp.json()).value;
100-
108+
101109
// exchange the OIDC token for an API token
102110
const mint_resp = await fetch('https://pypi.org/_/oidc/github/mint-token', {
103111
method: 'post',
@@ -127,6 +135,8 @@ jobs:
127135
contents: write # for softprops/action-gh-release to create GitHub release
128136
steps:
129137
- uses: actions/checkout@v4
138+
with:
139+
persist-credentials: false
130140
- name: Get release version
131141
id: get_version
132142
uses: actions/github-script@v7

0 commit comments

Comments
 (0)
Please sign in to comment.