Skip to content

Commit 9ae36b5

Browse files
authored
workflows: Add 3.5.x to cross-version-verify (#1592)
* Test with last release in 3.5.x series * Install the releases from pypi (it's simpler and arguably a better test) * Don't use a test asset as artifact: this way verify job does not need a checkout * Remove unneeded if-clause (from copy-pasting cross-os test originally) * Bump the 3.6 series version to newest 3.6.6 Signed-off-by: Jussi Kukkonen <[email protected]>
1 parent a62ef97 commit 9ae36b5

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

.github/workflows/cross-version-verify.yaml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ jobs:
4141
uses: sigstore-conformance/extremely-dangerous-public-oidc-beacon@4a8befcc16064dac9e97f210948d226e5c869bdc # v1.0.0
4242
- name: Sign
4343
run: |
44-
python -m sigstore --staging sign --bundle artifact-rekor2.sigstore.json --identity-token $(cat oidc-token.txt) --rekor-version=2 test/assets/a.txt
45-
python -m sigstore --staging sign --bundle artifact-rekor1.sigstore.json --identity-token $(cat oidc-token.txt) --rekor-version=1 test/assets/a.txt
44+
touch artifact
45+
python -m sigstore --staging sign --bundle artifact-rekor2.sigstore.json --identity-token $(cat oidc-token.txt) --rekor-version=2 artifact
46+
python -m sigstore --staging sign --bundle artifact-rekor1.sigstore.json --identity-token $(cat oidc-token.txt) --rekor-version=1 artifact
4647
- name: upload signature bundle
4748
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4849
with:
@@ -52,38 +53,31 @@ jobs:
5253
retention-days: 1
5354
verify:
5455
name: Verify with ${{ matrix.version }}
55-
if: ${{ always() }} # don't stop some verification if one of the signing jobs failed
5656
needs: [sign]
5757
runs-on: ubuntu-latest
5858
strategy:
5959
fail-fast: false # Don't cancel other jobs if one fails
6060
matrix:
61-
version: [v3.6.5, v4.0.0, v4.1.0]
61+
version: [3.5.6, 3.6.6, 4.0.0, 4.1.0]
6262
steps:
63-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
64-
with:
65-
persist-credentials: false
66-
ref: ${{matrix.version}}
67-
fetch-tags: true
6863
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
6964
with:
7065
python-version: "3.x"
71-
cache: "pip"
72-
cache-dependency-path: pyproject.toml
73-
- run: pip install .
66+
- run: pip install sigstore==${{ matrix.version }}
7467
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
7568
with:
7669
name: bundle
70+
- run: touch artifact
7771
- name: Verify (Rekor v2)
78-
if: matrix.version != 'v3.6.5'
72+
if: startsWith(matrix.version, '3.') != true
7973
run: |
8074
python -m sigstore --staging verify github --verbose \
8175
--cert-identity "https://github.com/sigstore-conformance/extremely-dangerous-public-oidc-beacon/.github/workflows/extremely-dangerous-oidc-beacon.yml@refs/heads/main" \
8276
--bundle artifact-rekor2.sigstore.json \
83-
test/assets/a.txt
77+
artifact
8478
- name: Verify (Rekor v1)
8579
run: |
8680
python -m sigstore --staging verify github --verbose \
8781
--cert-identity "https://github.com/sigstore-conformance/extremely-dangerous-public-oidc-beacon/.github/workflows/extremely-dangerous-oidc-beacon.yml@refs/heads/main" \
8882
--bundle artifact-rekor1.sigstore.json \
89-
test/assets/a.txt
83+
artifact

0 commit comments

Comments
 (0)