cheri/ci: update cirrus config (#43)

Author: jacobpake

.cirrus.yml

@@ -1,131 +1,117 @@
 gcp_credentials: ENCRYPTED[5ee9e22237c8368fdae53b368a38509d62a168e1b5a8162a9bd8dfef5e874a4f41cd8235d498b99d2c2860c77e06ecd1]
 
+gce_instance:
+  image_project: ubuntu-os-cloud
+  image_family: ubuntu-2404-lts-arm64
+  architecture: arm64
+  zone: us-east1-b
+  type: c4a-standard-16
+  disk: 60
+  spot: true
+
 # -- PR tasks
 
 pr_check_commits_task:
   skip: $CIRRUS_PR == ""
   name: (PR) Check commits structure
+  alias: pr_check_commits
   timeout_in: 240m
-  gce_instance: &arm_vm
-    image_project: ubuntu-os-cloud
-    image_family: ubuntu-2404-lts-arm64
-    architecture: arm64
-    zone: us-east1-b
-    type: c4a-standard-16
-    disk: 60
-    spot: true
   env:
     GH_TOKEN: ""
   dependencies_script:
     - set -eo pipefail
   # No need to clone.
   clone_script: []
   test_script: |
-    commits=$(curl -s -H "Accept: application/vnd.github+json" https://api.github.com/repos/CHERIoT-Platform/cheri-rust/pulls/$CIRRUS_PR | jq '.commits')
+    url=https://api.github.com/repos/CHERIoT-Platform/cheri-rust/pulls/$CIRRUS_PR
+    commits=$(curl -s -H "Accept: application/vnd.github+json" $url | jq '.commits')
     if [[ $commits -ne 1 ]]; then
       echo "Expected a single commit, found $commits"
       echo "In order to facilitate cherry-picking commits into other branches,"
       echo "please squash your commits into a single one."
       exit 1;
     fi
 
+# -- End PR tasks
+
 x_check_task:
   name: Run ./x check
+  alias: x_check
   # TODO(xdoardo): Figure out when it makes sense to have this dependency, or
   #   how that dependency should actually work. Having this dependency would
   #   pretty much mean making every PR that merges changes on `beta` to `master`
   #   to have failing CI, which would be the reason why we want to make PRs and
   #   not direct pushes in the first place.
   # depends_on: (PR) Check commits structure
   timeout_in: 240m
-  gce_instance: &arm_vm
-    image_project: ubuntu-os-cloud
-    image_family: ubuntu-2404-lts-arm64
-    architecture: arm64
-    zone: us-east1-b
-    type: c4a-standard-16
-    disk: 60
-    spot: true
-  env:
-      CIRRUS_CLONE_DEPTH: 0
-
   dependencies_script:
     - set -eo pipefail
     - apt-get update
     - apt-get install -y clang ninja-build lld cmake ccache perl
   gen_bootstrap_script: ./cheri/gen_bootstrap.sh
   setup_env_script:
-    - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/"
-    - export CCACHE_REMOTE_ONLY=1
-    - env
+    - echo "CCACHE_REMOTE_STORAGE=http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/" >> $CIRRUS_ENV
+    - echo "CCACHE_REMOTE_ONLY=1" >> $CIRRUS_ENV
+  check_env_script: env
   pull_master_script: git fetch origin master:refs/remotes/origin/master
   tidy_script: CC="clang" CXX="clang++" ./x test tidy
   check_script: CC="clang" CXX="clang++" ./x check
   ui_test_script: CC="clang" CXX="clang++" ./x test ui
 
 build_core_task:
   name: Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
+  alias: build_core
   depends_on:
-    - Run ./x check
+    - x_check
   timeout_in: 240m
-  gce_instance: &arm_vm
-    image_project: ubuntu-os-cloud
-    image_family: ubuntu-2404-lts-arm64
-    architecture: arm64
-    zone: us-east1-b
-    type: c4a-standard-16
-    disk: 60
-    spot: true
   env:
-      CIRRUS_CLONE_DEPTH: 0
-
+    CIRRUS_CLONE_DEPTH: "1"
   dependencies_script:
     - set -eo pipefail
     - apt-get update
     - apt-get install -y clang ninja-build lld cmake ccache perl
   gen_bootstrap_script: ./cheri/gen_bootstrap.sh
   setup_env_script:
-    - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/"
-    - export CCACHE_REMOTE_ONLY=1
-    - env
-  pull_master_script: git fetch origin master:refs/remotes/origin/master
+    - echo "CCACHE_REMOTE_STORAGE=http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/" >> $CIRRUS_ENV
+    - echo "CCACHE_REMOTE_ONLY=1" >> $CIRRUS_ENV
+  check_env_script: env
+  pull_master_script: git fetch origin master:refs/remotes/origin/master --depth 1
   build_script: CC="clang" CXX="clang++" ./x build compiler std --target=riscv32cheriot-unknown-cheriotrtos
 
 run_cheri_tests_task:
   name: Run CHERIoT-specific tests
+  alias: run_cheri_tests
   depends_on:
-    - Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
+    - build_core
   timeout_in: 240m
-  gce_instance: &arm_vm
-    image_project: ubuntu-os-cloud
-    image_family: ubuntu-2404-lts-arm64
-    architecture: arm64
-    zone: us-east1-b
-    type: c4a-standard-16
-    disk: 60
-    spot: true
   env:
-      CIRRUS_CLONE_DEPTH: 0
-      CARGO_HOME: /tmp/cargo
-      RUSTUP_HOME: /tmp/cargo
-      XMAKE_ROOT: "y"
-
+    CIRRUS_CLONE_DEPTH: "1"
+    CARGO_HOME: /tmp/cargo
+    RUSTUP_HOME: /tmp/cargo
+    XMAKE_ROOT: "y"
   dependencies_script:
     - set -eo pipefail
     - apt-get update
     - apt-get install -y clang ninja-build lld cmake ccache perl opam z3 libgmp-dev
   install_xmake_script: curl -fsSL https://xmake.io/shget.text | bash || true # The installer will fail without any informations.
-  verify_xmake_script: /root/.local/bin/xmake -v
-  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y && . "$CARGO_HOME/env"
+  verify_xmake_script: /root/.local/bin/xmake --version
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
   verify_rust_script: . "$CARGO_HOME/env" && cargo --version
-  build_sail_sim_script: git clone --recurse-submodules --depth=1 https://github.com/CHERIoT-Platform/cheriot-sail && cd cheriot-sail && opam init --reinit --bypass-check --disable-sandboxing --disable-shell-hook && eval $(opam env) && opam install sail --confirm-level=unsafe-yes && make csim && cp c_emulator/cheriot_sim /usr/local/bin
+  build_sail_sim_script:
+    - git clone --recurse-submodules --depth=1 https://github.com/CHERIoT-Platform/cheriot-sail
+    - opam init --reinit --bypass-check --disable-sandboxing --disable-shell-hook
+    - eval $(opam env)
+    - opam install sail --confirm-level=unsafe-yes
+    - cd cheriot-sail && make csim && cp c_emulator/cheriot_sim /usr/local/bin
   gen_bootstrap_script: ./cheri/gen_bootstrap.sh --build-clang
   setup_env_script:
-    - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/"
-    - export CCACHE_REMOTE_ONLY=1
-    - env
-  pull_master_script: git fetch origin master:refs/remotes/origin/master
+    - echo "CCACHE_REMOTE_STORAGE=http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/" >> $CIRRUS_ENV
+    - echo "CCACHE_REMOTE_ONLY=1" >> $CIRRUS_ENV
+  check_env_script: env
+  pull_master_script: git fetch origin master:refs/remotes/origin/master --depth 1
   build_rustc_script: CC="clang" CXX="clang++" ./x build compiler std --target=riscv32cheriot-unknown-cheriotrtos
   build_test_runner_script: cd ./cheri/tests/runner && . "$CARGO_HOME/env" && cargo build --release
-  run_tests_script: cd ./cheri/tests && ./runner/target/release/cheriot-runner -vvvvv . --sysroot=../../build/host/llvm --rustc=../../build/host/stage1/bin/rustc --xmake=/root/.local/bin/xmake
-# -- End PR tasks
+  run_tests_script: cd ./cheri/tests && ./runner/target/release/cheriot-runner -vvvvv .
+    --sysroot=../../build/host/llvm
+    --rustc=../../build/host/stage1/bin/rustc
+    --xmake=/root/.local/bin/xmake