Merged with origin/main

Author: Gustavo2622

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   compile-opam:
     name: EasyCrypt compilation (opam)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     steps:
@@ -30,7 +30,7 @@ jobs:
     name: EasyCrypt compilation (nix)
     env:
       HOME: /home/runner
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Setup Nix
@@ -49,7 +49,7 @@ jobs:
   check:
     name: Check EasyCrypt Libraries
     needs: compile-opam
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     strategy:
@@ -82,7 +82,7 @@ jobs:
 
   fetch-external-matrix:
     name: Fetch EasyCrypt External Projects Matrix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -97,7 +97,7 @@ jobs:
   external:
     name: Check EasyCrypt External Projects
     needs: [compile-opam, fetch-external-matrix]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
       image: ghcr.io/easycrypt/ec-build-box
     strategy:
@@ -159,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:
@@ -172,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,7 +34,7 @@
 
   { "name"       : "xsalsa20"
   , "repository" : "https://gitlab.com/fdupress/ec-xsalsa"
-  , "branch"     : "master"
+  , "branch"     : "ec-main"
   , "subdir"     : "."
   , "config"     : "config/tests.config"
   , "scenario"   : "xsalsa"

README.md

@@ -182,26 +182,26 @@ following [these instructions](https://nixos.org/manual/nix/stable/#chap-install
 
 Then, at the root of the EasyCrypt source tree, type:
 
-    ```
-    $> make nix-build
-    ```
+```
+$> make nix-build
+```
 
 Once completed, you will find the EasyCrypt binary in `result/bin`.
 
 You can also run
 
-    ```
-    $> make nix-build-with-provers
-    ```
+```
+$> make nix-build-with-provers
+```
 
 to install EasyCrypt along with a set of provers.
 
 
 For getting a development environment, you can run:
 
-    ```
-    $> make nix-develop
-    ```
+```
+$> make nix-develop
+```
 
 These will install all the required dependencies, a set of provers and
 will then drop you into a shell. From there, simply run `make` to

dune-project

@@ -28,7 +28,7 @@
   ppx_deriving
   ppx_deriving_yojson
   (progress (>= 0.2))
-  (why3 (and (>= 1.7.0) (< 1.8)))
+  (why3 (and (>= 1.8.0) (< 1.9)))
   yojson
   (zarith (>= 1.10))
 ))

easycrypt.opam

@@ -16,7 +16,7 @@ depends: [
   "ppx_deriving"
   "ppx_deriving_yojson"
   "progress" {>= "0.2"}
-  "why3" {>= "1.7.0" & < "1.8"}
+  "why3" {>= "1.8.0" & < "1.9"}
   "yojson"
   "zarith" {>= "1.10"}
   "odoc" {with-doc}