Minor changes to gen_boostrap.sh

.cirrus.yml

@@ -34,9 +34,9 @@ pr_check_commits_task:
 
 # -- End PR tasks
 
-x_check_task:
-  name: Run ./x check
-  alias: x_check
+x_test_task:
+  name: Run ./x test
+  alias: x_test
   # 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`
@@ -47,22 +47,21 @@ x_check_task:
   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
+    - apt-get install -y pkg-config clang ninja-build lld cmake ccache perl libssl-dev
+  gen_bootstrap_script: ./cheri/gen_bootstrap.sh && cat bootstrap.toml
   setup_env_script:
     - 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
+  rust_check_script: CC="clang" CXX="clang++" ./x check
+  rust_test_script: CC="clang" CXX="clang++" ./x test --skip src/tools/linkchecker --skip tests/rustdoc-ui --skip tests/run-make
 
 build_core_task:
   name: Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
   alias: build_core
   depends_on:
-    - x_check
+    - x_test
   timeout_in: 240m
   env:
     CIRRUS_CLONE_DEPTH: "1"

cheri/gen_bootstrap.sh

@@ -17,6 +17,35 @@ elif [ -z "${CUSTOM_CMAKE_FLAGS+set}" ]; then
         CUSTOM_CMAKE_FLAGS=""
 fi
 
+# Check if we're running CI for a PR to main.
+if [ -n "${CIRRUS_BASE_BRANCH+set}" ]; then
+    if [ "$CIRRUS_BASE_BRANCH" == "main" ]; then
+        CHANNEL="nightly"
+        # We are seeing some faults unrelated to our changes when CI runs from
+        # main, specifically tied to gcc. When running like that (CI from main)
+        # we want to restrict the backend to LLVM and cranelift only, so that
+        # we don't get stuck on things that aren't our fault. Ideally, we
+        # should restore the normal behaviour once the error is fixed.
+        CODEGEN_BACKENDS="codegen-backends = [\"llvm\",\"cranelift\"]"
+    else
+        # TODO: change this to `dev` once we add rustfmt to the beta branch, so
+        # that fmt --check is part of the tests.
+        CHANNEL="beta"
+    fi
+# Otherwise we may be running for a direct push to main.
+elif [ -n "${CIRRUS_BRANCH+set}" ]; then
+    if [ "$CIRRUS_BRANCH" == "main" ]; then
+        CHANNEL="nightly"
+
+        # See comment above.
+        CODEGEN_BACKENDS="codegen-backends = [\"llvm\",\"cranelift\"]"
+    else
+        CHANNEL="beta"
+    fi
+else
+        CHANNEL="beta"
+fi
+
 if [ -e "$FILE" ]; then
   echo "$FILE already exists!"
   exit 1
@@ -26,14 +55,14 @@ cat > "$FILE" <<- EOF
 # See bootstrap.example.toml for documentation of available options
 #
 profile = "compiler"  # Includes one of the default files in src/bootstrap/defaults
-change-id = 140732
+change-id = "ignore"
 
 [build]
 ccache = true
 
 [rust]
-channel = "beta"
-#codegen-backends = ["llvm"]
+channel = "$CHANNEL"
+$CODEGEN_BACKENDS
 #debug = true
 #debuginfo-level = 2
 std-features = ["compiler-builtins-mem"]