Cirrus CI support

ClementTsang · Jan 2, 2023 · 05cfe66 · 05cfe66
1 parent 9ee1255
commit 05cfe66
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -76,6 +76,7 @@ build_task:
     BTM_GENERATE: true
     COMPLETION_DIR: "target/tmp/bottom/completion/"
     MANPAGE_DIR: "target/tmp/bottom/manpage/"
+    # -PLACEHOLDER FOR CI-
   matrix:
     - name: "FreeBSD 13 Build"
       alias: "freebsd_13_1_build"
@@ -104,6 +105,7 @@ build_task:
     - . $HOME/.cargo/env
     - cargo build --release --verbose --locked --features deploy
     - mv ./target/release/btm ./
+    - ./btm -V
     - mv "$COMPLETION_DIR" completion
     - mv "$MANPAGE_DIR" manpage
     - tar -czvf bottom_$NAME.tar.gz btm completion

diff --git a/build.rs b/build.rs
@@ -64,11 +64,15 @@ fn nightly_version() {
 
     match env::var_os(ENV_KEY) {
         Some(var) if !var.is_empty() && var == "nightly" => {
-            if let Ok(output) = std::process::Command::new("git")
+            let version = env!("CARGO_PKG_VERSION");
+
+            if let Some(cirrus_sha) = option_env!("CIRRUS_CHANGE_IN_REPO") {
+                let git_hash: &str = &cirrus_sha[..8];
+                println!("cargo:rustc-env=NIGHTLY_VERSION={version}-nightly-{git_hash}");
+            } else if let Ok(output) = std::process::Command::new("git")
                 .args(["rev-parse", "--short", "HEAD"])
                 .output()
             {
-                let version = env!("CARGO_PKG_VERSION");
                 let git_hash = String::from_utf8(output.stdout).unwrap();
                 println!("cargo:rustc-env=NIGHTLY_VERSION={version}-nightly-{git_hash}");
             }
@@ -77,6 +81,7 @@ fn nightly_version() {
     }
 
     println!("cargo:rerun-if-env-changed={ENV_KEY}");
+    println!("cargo:rerun-if-env-changed=CIRRUS_CHANGE_IN_REPO");
 }
 
 fn main() -> Result<()> {

diff --git a/scripts/cirrus/build.py b/scripts/cirrus/build.py
@@ -28,17 +28,24 @@
 def make_query_request(key: str, branch: str, build_type: str):
     print("Creating query request.")
     mutation_id = "Cirrus CI Build {}-{}-{}".format(build_type, branch, int(time()))
+
+    # Dumb but if it works...
+    config_override = (
+        Path(".cirrus.yml").read_text().replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
+    )
     query = """
         mutation CreateCirrusCIBuild (
             $repo: ID!,
             $branch: String!,
-            $mutation_id: String!
+            $mutation_id: String!,
+            $config_override: String,
         ) {
             createBuild(
                 input: {
                     repositoryId: $repo,
                     branch: $branch,
                     clientMutationId: $mutation_id,
+                    configOverride: $config_override
                 }
             ) {
                 build {
@@ -52,6 +59,7 @@ def make_query_request(key: str, branch: str, build_type: str):
         "repo": "6646638922956800",
         "branch": branch,
         "mutation_id": mutation_id,
+        "config_override": dedent(config_override),
     }
     data = {"query": dedent(query), "variables": params}
     data = json.dumps(data).encode()