Merge pull request #358 from Nadrieril/split-charon-ci-check

.github/workflows/ci.yml

@@ -54,13 +54,21 @@ jobs:
       - uses: actions/checkout@v4
       - run: nix develop --command bash -c "cd tests/lean && make"
 
-  check-charon-pin:
+  charon-pin-is-forward:
     runs-on: [self-hosted, linux, nix]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # deep clone in order to get access to other commits
-      - run: nix develop --command ./scripts/ci-check-charon-pin.sh
+      - run: nix develop --command ./scripts/ci-check-charon-pin-is-forward.sh
+
+  charon-pin-is-merged:
+    runs-on: [self-hosted, linux, nix]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # deep clone in order to get access to other commits
+      - run: nix develop --command ./scripts/ci-check-charon-pin-is-merged.sh
 
   userdocs:
     runs-on: [self-hosted, linux, nix]

scripts/ci-check-charon-pin.sh → scripts/ci-check-charon-pin-is-forward.sh

@@ -1,22 +1,14 @@
 #!/usr/bin/env bash
-# Checks that the charon pin:
-# - moves forward from the previous pin, to ensure we don't regress the charon version;
-# - is merged into Charon.
+# Checks that the charon pin moves forward from the previous pin, to ensure we don't regress the Charon version.
 
 NEW_CHARON_PIN="$(cat flake.lock | jq -r .nodes.charon.locked.rev)"
 OLD_CHARON_PIN="$(git show origin/main:flake.lock | jq -r .nodes.charon.locked.rev)"
 echo "This PR updates the charon pin from $OLD_CHARON_PIN to $NEW_CHARON_PIN"
 
 git clone https://github.com/AeneasVerif/charon
 cd charon
-CHARON_MAIN="$(git rev-parse HEAD)"
 
 if ! git merge-base --is-ancestor "$OLD_CHARON_PIN" "$NEW_CHARON_PIN"; then
     echo "Error: the new charon pin does not have the old one as its ancestor. The pin must only move forward."
     exit 1
 fi
-
-if ! git merge-base --is-ancestor "$NEW_CHARON_PIN" "$CHARON_MAIN"; then
-    echo "Error: commit $NEW_CHARON_PIN is not merged into Charon."
-    exit 1
-fi

scripts/ci-check-charon-pin-is-merged.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Checks that the charon pin is merged into Charon.
+
+NEW_CHARON_PIN="$(cat flake.lock | jq -r .nodes.charon.locked.rev)"
+OLD_CHARON_PIN="$(git show origin/main:flake.lock | jq -r .nodes.charon.locked.rev)"
+echo "This PR updates the charon pin from $OLD_CHARON_PIN to $NEW_CHARON_PIN"
+
+git clone https://github.com/AeneasVerif/charon
+cd charon
+CHARON_MAIN="$(git rev-parse HEAD)"
+
+if ! git merge-base --is-ancestor "$NEW_CHARON_PIN" "$CHARON_MAIN"; then
+    echo "Error: commit $NEW_CHARON_PIN is not merged into Charon."
+    exit 1
+fi