Merge remote-tracking branch 'origin/main' into inlined-doc

Author: strub

.github/workflows/ci.yml

@@ -1,30 +1,20 @@
 name: EasyCrypt compilation & check
 
-on: [push,pull_request,merge_group]
+on:
+  push:
+    branches:
+      - 'main'
+  pull_request:
 
 env:
   HOME: /home/charlie
   OPAMYES: true
   OPAMJOBS: 2
 
 jobs:
-  pre_job:
-    name: Check for Duplicates Jobs
-    runs-on: ubuntu-20.04
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-    - uses: fkirc/skip-duplicate-actions@v5
-      id: skip_check
-      with:
-        concurrent_skipping: 'same_content_newer'
-        skip_after_successful_duplicate: 'false'
-
   compile-opam:
     name: EasyCrypt compilation (opam)
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     steps:
@@ -34,15 +24,13 @@ jobs:
         opam pin add -n easycrypt .
         opam install --deps-only easycrypt
     - name: Compile EasyCrypt
-      run: opam exec -- make
+      run: opam exec -- make PROFILE=ci
 
   compile-nix:
     name: EasyCrypt compilation (nix)
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
     env:
       HOME: /home/runner
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Setup Nix
@@ -60,9 +48,8 @@ jobs:
 
   check:
     name: Check EasyCrypt Libraries
-    needs: [pre_job, compile-opam]
-    if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-20.04
+    needs: compile-opam
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     strategy:
@@ -95,8 +82,7 @@ jobs:
 
   fetch-external-matrix:
     name: Fetch EasyCrypt External Projects Matrix
-    needs: [pre_job]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -110,9 +96,8 @@ jobs:
 
   external:
     name: Check EasyCrypt External Projects
-    needs: [pre_job, compile-opam, fetch-external-matrix]
-    if: needs.pre_job.outputs.should_skip != 'true'
-    runs-on: ubuntu-20.04
+    needs: [compile-opam, fetch-external-matrix]
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     strategy:
@@ -123,10 +108,21 @@ jobs:
     - uses: actions/checkout@v4
       with:
         path: easycrypt
+    - name: Extract target branch name
+      run: echo "branch=merge-${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+      id: extract_branch
+    - name: Find remote branch
+      id: branch_name
+      run: |
+        git ls-remote --exit-code --heads ${{ matrix.target.repository }} refs/heads/${{ steps.extract_branch.outputs.branch }} || exists=$?
+        if [ "$exists" = "2" ];
+        then echo "REPO_BRANCH=${{ matrix.target.branch }}" >> $GITHUB_OUTPUT;
+        else echo "REPO_BRANCH=${{ steps.extract_branch.outputs.branch }}" >> $GITHUB_OUTPUT;
+        fi
     - name: Checkout External Project
       run: |
         git clone --recurse-submodules \
-          -b ${{ matrix.target.branch }} \
+          -b ${{ steps.branch_name.outputs.REPO_BRANCH }} \
           ${{ matrix.target.repository }} \
           project/${{ matrix.target.name }}
     - name: Install EasyCrypt dependencies
@@ -163,7 +159,7 @@ jobs:
     name: Check EasyCrypt External Projects (set-status)
     if: always()
     needs: [external]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: re-actors/alls-green@release/v1
       with:
@@ -176,7 +172,7 @@ jobs:
     if: |
       (github.event_name == 'push') ||
       (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: technote-space/workflow-conclusion-action@v3
     - uses: zulip/github-actions-zulip/send-message@v1

.github/workflows/external.json

@@ -34,10 +34,43 @@
 
   { "name"       : "xsalsa20"
   , "repository" : "https://gitlab.com/fdupress/ec-xsalsa"
-  , "branch"     : "master"
+  , "branch"     : "ec-main"
   , "subdir"     : "."
   , "config"     : "config/tests.config"
   , "scenario"   : "xsalsa"
   , "options"    : ""
   }
+
+  ,
+
+  { "name"       : "xmss-acai"
+  , "repository" : "https://github.com/MM45/FV-XMSS-EC"
+  , "branch"     : "master"
+  , "subdir"     : "."
+  , "config"     : "config/tests.config"
+  , "scenario"   : "xmss-acai"
+  , "options"    : ""
+  }
+
+  ,
+
+  { "name"       : "xmss-fsai"
+  , "repository" : "https://github.com/MM45/FV-XMSS-EC"
+  , "branch"     : "master"
+  , "subdir"     : "."
+  , "config"     : "config/tests.config"
+  , "scenario"   : "xmss-fsai"
+  , "options"    : ""
+  }
+
+  ,
+
+  { "name"       : "sphincsplus"
+  , "repository" : "https://github.com/MM45/FV-SPHINCSPLUS-EC"
+  , "branch"     : "master"
+  , "subdir"     : "."
+  , "config"     : "config/tests.config"
+  , "scenario"   : "sphincsplus"
+  , "options"    : ""
+  }
 ]