Skip to content

Commit 25be8c6

Browse files
committed
Merge remote-tracking branch 'origin/main' into add-rekor-version-option
2 parents 41d95ad + d1886a0 commit 25be8c6

Some content is hidden

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

53 files changed

+955
-1053
lines changed

.github/workflows/check-embedded-root.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313

1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
with:
1717
persist-credentials: false
1818

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ on:
77
- series/*
88
pull_request:
99
schedule:
10-
- cron: '0 12 * * *'
10+
- cron: "0 12 * * *"
11+
12+
permissions: {}
1113

1214
jobs:
1315
test:
@@ -29,7 +31,7 @@ jobs:
2931
- { py: "3.13", os: "macos-latest" }
3032
runs-on: ${{ matrix.conf.os }}
3133
steps:
32-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3335
with:
3436
persist-credentials: false
3537

@@ -98,7 +100,7 @@ jobs:
98100
if: always()
99101

100102
needs:
101-
- test
103+
- test
102104

103105
runs-on: ubuntu-latest
104106

@@ -115,18 +117,18 @@ jobs:
115117
runs-on: ubuntu-latest
116118

117119
steps:
118-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
120+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
119121
with:
120122
persist-credentials: false
121123

122124
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
123125
with:
124-
python-version: '3.x'
126+
python-version: "3.x"
125127

126128
- run: pip install coverage[toml]
127129

128130
- name: download coverage data
129-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
131+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
130132
with:
131133
path: all-artifacts/
132134

.github/workflows/conformance.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ on:
77
workflow_dispatch:
88
pull_request:
99

10+
permissions: {}
11+
1012
jobs:
1113
conformance:
1214
runs-on: ubuntu-latest
1315
steps:
14-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1517
with:
1618
persist-credentials: false
1719

@@ -24,7 +26,7 @@ jobs:
2426
- name: install sigstore-python
2527
run: python -m pip install .
2628

27-
- uses: sigstore/sigstore-conformance@fd90e6b0f3046f2276a6659481de6df495dea3b9 # v0.0.18
29+
- uses: sigstore/sigstore-conformance@a7ac671d8e55553de127c8b1ad96d8d416315e83 # v0.0.19
2830
with:
2931
entrypoint: ${{ github.workspace }}/test/integration/sigstore-python-conformance
30-
xfail: "test_verify_dsse_bundle_with_trust_root" # see issue 1442
32+
xfail: "test_verify*intoto-with-custom-trust-root]" # see issue 1442

.github/workflows/docs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
branches:
66
- main
77

8+
permissions: {}
9+
810
jobs:
911
build:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1315
with:
1416
persist-credentials: false
1517

@@ -28,7 +30,7 @@ jobs:
2830
make doc
2931
3032
- name: upload docs artifact
31-
uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1
33+
uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
3234
with:
3335
path: ./html/
3436

.github/workflows/lint.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- main
77
pull_request:
88

9+
permissions: {}
10+
911
jobs:
1012
lint:
1113
runs-on: ubuntu-latest
1214
steps:
13-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1416
with:
1517
persist-credentials: false
1618

@@ -29,7 +31,7 @@ jobs:
2931
check-readme:
3032
runs-on: ubuntu-latest
3133
steps:
32-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3335
with:
3436
persist-credentials: false
3537

@@ -50,7 +52,7 @@ jobs:
5052
licenses:
5153
runs-on: ubuntu-latest
5254
steps:
53-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
55+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5456
with:
5557
persist-credentials: false
5658

@@ -66,7 +68,7 @@ jobs:
6668
x509-testcases:
6769
runs-on: ubuntu-latest
6870
steps:
69-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
71+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7072
with:
7173
persist-credentials: false
7274

@@ -87,10 +89,10 @@ jobs:
8789
if: always()
8890

8991
needs:
90-
- lint
91-
- check-readme
92-
- licenses
93-
- x509-testcases
92+
- lint
93+
- check-readme
94+
- licenses
95+
- x509-testcases
9496

9597
runs-on: ubuntu-latest
9698

.github/workflows/pin-requirements.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
sigstore-pin-requirements-branch: ${{ steps.get-branch.outputs.sigstore-pin-requirements-branch }}
3131

3232
steps:
33-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
ref: main
3636
# NOTE: Needed for `git describe` below.
@@ -120,7 +120,7 @@ jobs:
120120
SIGSTORE_PIN_REQUIREMENTS_BRANCH: ${{ needs.update-pinned-requirements.outputs.sigstore-pin-requirements-branch }}
121121

122122
steps:
123-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
123+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
124124
with:
125125
ref: ${{ env.SIGSTORE_PIN_REQUIREMENTS_BRANCH }}
126126
# NOTE: Needed to push back to the repo.

.github/workflows/release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55
types:
66
- published
77

8-
permissions: # added using https://github.com/step-security/secure-workflows
9-
contents: read
8+
permissions: {}
109

1110
jobs:
1211
build:
@@ -15,7 +14,7 @@ jobs:
1514
permissions:
1615
id-token: write
1716
steps:
18-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1918
with:
2019
persist-credentials: false
2120

@@ -95,11 +94,11 @@ jobs:
9594
attestations: write # To persist the attestation files.
9695
steps:
9796
- name: Download artifacts directories # goes to current working directory
98-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
97+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
9998
- name: Generate build provenance
10099
uses: actions/attest-build-provenance@v2
101100
with:
102-
subject-path: 'built-packages/*'
101+
subject-path: "built-packages/*"
103102

104103
release-pypi:
105104
needs: [build, generate-provenance]
@@ -109,7 +108,7 @@ jobs:
109108
id-token: write
110109
steps:
111110
- name: Download artifacts directories # goes to current working directory
112-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
111+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
113112

114113
- name: publish
115114
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
@@ -124,7 +123,7 @@ jobs:
124123
contents: write
125124
steps:
126125
- name: Download artifacts directories # goes to current working directory
127-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
126+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
128127

129128
- name: Upload artifacts to github
130129
# Confusingly, this action also supports updating releases, not

.github/workflows/requirements.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ on:
1212
required: true
1313
pull_request:
1414
schedule:
15-
- cron: '0 12 * * *'
15+
- cron: "0 12 * * *"
16+
17+
permissions: {}
1618

1719
jobs:
1820
test_requirements:
@@ -31,7 +33,7 @@ jobs:
3133
run: |
3234
echo "SIGSTORE_REF=${GITHUB_REF}" >> "${GITHUB_ENV}"
3335
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3537
with:
3638
ref: ${{ env.SIGSTORE_REF }}
3739
persist-credentials: false

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id-token: write
2525
steps:
2626
- name: "Checkout code"
27-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
with:
2929
persist-credentials: false
3030

@@ -52,6 +52,6 @@ jobs:
5252

5353
# Upload the results to GitHub's code scanning dashboard.
5454
- name: "Upload to code-scanning"
55-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
55+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
5656
with:
5757
sarif_file: results.sarif

.github/workflows/staging-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ on:
55
branches:
66
- main
77
schedule:
8-
- cron: '0 */8 * * *'
8+
- cron: "0 */8 * * *"
9+
10+
permissions: {}
911

1012
jobs:
1113
staging-tests:
@@ -17,7 +19,7 @@ jobs:
1719
# Needed to create an issue, on failure.
1820
issues: write
1921
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2123
with:
2224
persist-credentials: false
2325

@@ -27,7 +29,6 @@ jobs:
2729
cache: "pip"
2830
cache-dependency-path: pyproject.toml
2931

30-
3132
- name: staging tests
3233
env:
3334
SIGSTORE_LOGLEVEL: DEBUG

0 commit comments

Comments
 (0)