Various small fixes (#294)

* action: Upload results even on failure

We'd rather see failures in the report than missing data.

Signed-off-by: Jussi Kukkonen <[email protected]>

* report generation: Avoid checkmarks if no results available

Signed-off-by: Jussi Kukkonen <[email protected]>

* report generation: Remove action version for now

Currently the action version is incorrect (git describe gives the
client tags, not conformance tags). We may want to redo this
with a version number from python sources but for now remove it.

Signed-off-by: Jussi Kukkonen <[email protected]>

* Revert "Bump pytest from 8.4.2 to 9.0.0 (#290)"

This reverts commit 183d5af.

Somehow the new pytest manages to import things from the client
directory whatever action.py does ... revert upgrade for now.

Signed-off-by: Jussi Kukkonen <[email protected]>

---------

Signed-off-by: Jussi Kukkonen <[email protected]>

Author: jku

.github/scripts/generate_client_report.py

@@ -2,7 +2,6 @@
 
 import argparse
 import json
-import os
 from dataclasses import dataclass
 from datetime import UTC, datetime
 from pathlib import Path
@@ -19,7 +18,6 @@ class Result:
     skipped: int = -1
     rekor2_verify: bool = False
     rekor2_sign: bool = False
-    conformance_action_version: str = "unknown"
     client_sha: str = ""
     client_sha_url: str = ""
     workflow_run: str = ""
@@ -35,9 +33,6 @@ def __init__(self, report_path: Path):
         self.results_found = True
 
         environment = data.get("environment", {})
-        self.conformance_action_version = environment.get(
-            "conformance_action_version", "unknown"
-        )
         self.client_sha = environment.get("client_sha", "")
         self.client_sha_url = environment.get("client_sha_url", "")
         self.workflow_run = environment.get("workflow_run", "")
@@ -87,7 +82,6 @@ def _generate_html(results: list[Result]):
                     <th>Xfailed</th>
                     <th>Rekor v2 verify</th>
                     <th>Rekor v2 sign</th>
-                    <th>Action Version</th>
                 </tr>
             </thead>
             <tbody>
@@ -107,6 +101,9 @@ def _generate_html(results: list[Result]):
         if res.workflow_run:
             client_html += f' (<a href="{res.workflow_run}">run</a>)'
 
+        rekor2_verify = "✅" if res.rekor2_verify else "❌"
+        rekor2_sign = "✅" if res.rekor2_sign else "❌"
+
         html += f"""
                 <tr class="{status_class}">
                     <td>{client_html}</td>
@@ -115,9 +112,8 @@ def _generate_html(results: list[Result]):
                     <td>{res.failed if res.results_found else ""}</td>
                     <td>{res.skipped if res.results_found else ""}</td>
                     <td>{res.xfailed if res.results_found else ""}</td>
-                    <td>{"✅" if res.rekor2_verify else "❌"}</td>
-                    <td>{"✅" if res.rekor2_sign else "❌"}</td>
-                    <td>{res.conformance_action_version}</td>
+                    <td>{rekor2_verify if res.results_found else ""}</td>
+                    <td>{rekor2_sign if res.results_found else ""}</td>
                 </tr>
         """
     html += """

action.py

@@ -30,8 +30,6 @@ def _debug(msg):
 def _sigstore_conformance(environment: str) -> int:
     args = ["--json-report", "--json-report-file=conformance-report.json", "--durations=0"]
 
-
-
     if _DEBUG:
         args.extend(["-s", "-vv", "--showlocals"])
 
@@ -53,14 +51,11 @@ def _sigstore_conformance(environment: str) -> int:
 
     status = pytest.main([str(_ACTION_PATH / "test"), *args])
 
-    # Inject the action version into the report
+    # Inject some metadata into the report
     with open("conformance-report.json", "r+") as f:
         report_data = json.load(f)
         if "environment" not in report_data:
             report_data["environment"] = {}
-        report_data["environment"]["conformance_action_version"] = os.getenv(
-            "GHA_SIGSTORE_CONFORMANCE_ACTION_VERSION", "unknown"
-        )
         client_sha = os.getenv("GHA_SIGSTORE_CONFORMANCE_CLIENT_SHA")
         if client_sha:
             report_data["environment"]["client_sha"] = client_sha

action.yml

@@ -52,11 +52,6 @@ runs:
         echo "::endgroup::"
       shell: bash
 
-    - name: Get action version
-      id: get_action_version
-      run: echo "action_version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
-      shell: bash
-
     - name: Run sigstore-conformance
       id: sigstore-conformance
       run: |
@@ -72,11 +67,10 @@ runs:
         GHA_SIGSTORE_CONFORMANCE_CLIENT_SHA_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
         GHA_SIGSTORE_CONFORMANCE_WORKFLOW_RUN: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         GHA_SIGSTORE_CONFORMANCE_SELFTEST_BIN: "${{ github.workspace }}/sigstore-conformance-selftest-env/bin/sigstore"
-        GHA_SIGSTORE_CONFORMANCE_ACTION_VERSION: "${{ steps.get_action_version.outputs.action_version }}"
       shell: bash
 
     - name: Upload conformance result
-      if: ${{ inputs.skip-result-upload == 'false' && inputs.environment == 'production' }}
+      if: ${{ always() && inputs.skip-result-upload == 'false' && inputs.environment == 'production' }}
       uses: actions/upload-artifact@v5
       with:
         name: conformance-results

requirements.in

@@ -1,4 +1,4 @@
-pytest==9.0.0
+pytest==8.4.2
 pytest-json-report==1.5.0
 pytest-subtests==0.15.0
 requests==2.32.5

requirements.txt

@@ -592,9 +592,9 @@ pygments==2.19.2 \
     --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \
     --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b
     # via pytest
-pytest==9.0.0 \
-    --hash=sha256:8f44522eafe4137b0f35c9ce3072931a788a21ee40a2ed279e817d3cc16ed21e \
-    --hash=sha256:e5ccdf10b0bac554970ee88fc1a4ad0ee5d221f8ef22321f9b7e4584e19d7f96
+pytest==8.4.2 \
+    --hash=sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01 \
+    --hash=sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79
     # via
     #   -r requirements.in
     #   pytest-json-report