Repository

.github/workflows/build_and_deploy.yml

@@ -8,7 +8,7 @@ name: Build report and deploy site
 
 on:
   push:
-    branches: [main, stateful]
+    branches: [main]
     tags: ['v*']
   workflow_dispatch:
 
@@ -23,10 +23,10 @@ concurrency:
 
 env:
   GENERATED_PATHS: |
-    utils/all_size_capped_candidates.csv
-    utils/all_unbound_candidates.csv
-    utils/global_X_thresholds.csv
-    utils/master_extremes_summary.csv
+    analysis/all_size_capped_candidates.csv
+    analysis/all_unbound_candidates.csv
+    analysis/global_X_thresholds.csv
+    analysis/master_extremes_summary.csv
     site/data.json
     document/content/images/sieve_step*.png
     document/content/images/concentric_diagram.png
@@ -44,14 +44,14 @@ jobs:
       image: sagemath/sagemath:10.4   # pinned; bump deliberately and re-verify
       options: --user root            # image's default user cannot write the runner workspace
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Restore generated artifacts (keyed on generator sources)
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v6
         with:
           path: ${{ env.GENERATED_PATHS }}
-          key: generated-v1-${{ hashFiles('costs.sage', 'security.sage', 'slhdsa-2to40.sage', 'stateful.sage', 'export_site_data.sage', 'octopus_pmf.py', 'utils/*.py', 'Makefile') }}
+          key: generated-v1-${{ hashFiles('model/*.sage', 'scripts/*.sage', 'third_party/*.py', 'analysis/*.py', 'Makefile', 'parameters.json') }}
 
       - name: Generate (sweeps, derived tables, data.json, figures)
         if: steps.cache.outputs.cache-hit != 'true'
@@ -65,7 +65,7 @@ jobs:
           make sweeps derived data figures PYTHON="sage -python"
 
       - name: Upload generated artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: generated
           path: ${{ env.GENERATED_PATHS }}
@@ -77,22 +77,22 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Place generated artifacts into the tree
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: generated
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v7
         with:
           python-version: '3.12'
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v7
         with:
           node-version: '22'
 
       - name: Regression suite (generated artifacts required)
-        run: GENERATED_REQUIRED=1 python3 tests/test_regression.py
+        run: GENERATED_REQUIRED=1 python3 tests/run.py
 
       - name: Compile report
         uses: xu-cheng/latex-action@v3
@@ -104,20 +104,20 @@ jobs:
         run: cp document/main.pdf site/report.pdf
 
       - name: Upload Pages artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: .   # whole tree, preserving the /site/... URL structure
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
 
       - name: Attach data + report to release (tags only)
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           files: |
             site/report.pdf
             site/data.json
-            utils/all_size_capped_candidates.csv
-            utils/all_unbound_candidates.csv
+            analysis/all_size_capped_candidates.csv
+            analysis/all_unbound_candidates.csv

.github/workflows/tests.yml

@@ -2,21 +2,21 @@ name: tests
 
 on:
   push:
-    branches: [main, stateful]
+    branches: [main]
   pull_request:
 
 jobs:
   regression:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
           python-version: '3.12'
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v7
         with:
           node-version: '22'
       - name: Synthesize generated artifacts from the reference model
         run: python3 tests/synth_generated.py
       - name: Run regression suite
-        run: GENERATED_REQUIRED=1 python3 tests/test_regression.py
+        run: GENERATED_REQUIRED=1 python3 tests/run.py