Update and integrate with hc-github-config (#1)

* Update and integrate with hc-github-config

* Verify integration

* Refer to dev shell

* Remove test trigger

.github/workflows/check.yml

@@ -0,0 +1,27 @@
+name: Check
+
+on:
+  push:
+    branches:
+      - main
+  pull_request: {}
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          cargo fmt --check
+          cargo clippy --all-targets --all-features -- -D warnings
+          cargo test --all-targets --all-features
+  ci_pass:
+    if: always()
+    runs-on: ubuntu-latest
+    needs: [ check ]
+    steps:
+      - uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}
+

.github/workflows/integration.yml

@@ -9,13 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - uses: actions/checkout@v4
-        - uses: cachix/install-nix-action@v22
-        - uses: cachix/cachix-action@v12
+        - uses: cachix/install-nix-action@v30
+        - uses: cachix/cachix-action@v15
           with:
             name: holochain-ci
         - name: Test
           uses: ./
           with:
-            derivation: github:holochain/holochain#devShells.x86_64-linux.holonix
-            extra_build_args: --refresh --override-input versions github:holochain/holochain?dir=versions/0_2
-            permit_build_derivations: hn-introspect,nix-shell,rust-default-1.66.1,inheritCargoArtifactsHook,cargoHelperFunctionsHook
+            derivation: github:holochain/holonix?ref=main-0.4#devShells.x86_64-linux.default

src/app.rs

@@ -9,14 +9,17 @@ use anyhow::anyhow;
 use crate::parser::{parse_log, CacheInfo};
 
 fn from_csv(input: &str) -> anyhow::Result<HashSet<String>> {
-    Ok(input.split(",").filter_map(|v| {
-        let x = v.trim().to_owned();
-        if !x.is_empty() {
-            Some(x)
-        } else {
-            None
-        }
-    }).collect())
+    Ok(input
+        .split(",")
+        .filter_map(|v| {
+            let x = v.trim().to_owned();
+            if !x.is_empty() {
+                Some(x)
+            } else {
+                None
+            }
+        })
+        .collect())
 }
 
 pub fn run_app() -> anyhow::Result<()> {
@@ -41,9 +44,9 @@ pub fn run_app() -> anyhow::Result<()> {
     println!("Starting Nix build");
     stdout().flush()?;
 
-    let output = cmd.output().map_err(|e| {
-        anyhow!("Failed to spawn the Nix build: {:?}", e)
-    })?;
+    let output = cmd
+        .output()
+        .map_err(|e| anyhow!("Failed to spawn the Nix build: {:?}", e))?;
 
     println!("Finished Nix build");
     stdout().flush()?;
@@ -73,7 +76,11 @@ pub fn run_app() -> anyhow::Result<()> {
     stdout().flush()?;
 
     if validate(
-        from_csv(std::env::var("PERMIT_BUILD_DERIVATIONS").unwrap_or_else(|_| "".to_string()).as_str())?,
+        from_csv(
+            std::env::var("PERMIT_BUILD_DERIVATIONS")
+                .unwrap_or_else(|_| "".to_string())
+                .as_str(),
+        )?,
         &cache_info,
     )? {
         println!("Validation passed!");
@@ -93,14 +100,18 @@ pub fn run_app() -> anyhow::Result<()> {
     Ok(())
 }
 
-pub fn validate(permit_build_derivations: HashSet<String>, cache_info: &CacheInfo) -> anyhow::Result<bool> {
+pub fn validate(
+    permit_build_derivations: HashSet<String>,
+    cache_info: &CacheInfo,
+) -> anyhow::Result<bool> {
     let mut all_passed = true;
 
     let mut permits_used = HashSet::new();
 
     for to_build in cache_info.get_derivations_to_build() {
         let to_build_name: String = to_build
-            .strip_suffix(".drv").ok_or(anyhow!("Not a derivation? {}", to_build))?
+            .strip_suffix(".drv")
+            .ok_or(anyhow!("Not a derivation? {}", to_build))?
             .split("-")
             .skip(1)
             .collect::<Vec<&str>>()

src/main.rs

@@ -1,8 +1,7 @@
-
 use app::run_app;
 
-mod parser;
 mod app;
+mod parser;
 
 fn main() -> anyhow::Result<()> {
     run_app()

src/parser.rs

@@ -59,39 +59,42 @@ where
             ),
             fold_many1(
                 context("build-derivation-line", parse_line::<E>),
-                || vec![],
+                Vec::new,
+                |mut acc, line| {
+                    acc.push(line);
+                    acc
+                },
+            ),
+        )),
+        opt(preceded(
+            context(
+                "start-of-fetched-derivations",
+                tuple((
+                    take_until("these "),
+                    take(6usize),
+                    take_until("fetched"),
+                    take(7usize),
+                    take_until(":"),
+                    take(1usize),
+                    newline,
+                )),
+            ),
+            fold_many1(
+                context("fetch-derivation-line", parse_line::<E>),
+                Vec::new,
                 |mut acc, line| {
                     acc.push(line);
                     acc
                 },
             ),
         )),
-        opt(preceded(context(
-            "start-of-fetched-derivations",
-            tuple((
-                take_until("these "),
-                take(6usize),
-                take_until("fetched"),
-                take(7usize),
-                take_until(":"),
-                take(1usize),
-                newline,
-            )),
-        ), fold_many1(
-            context("fetch-derivation-line", parse_line::<E>),
-            || vec![],
-            |mut acc, line| {
-                acc.push(line);
-                acc
-            },
-        ))),
     ))(input)
     {
         Ok((rest, (to_build, to_fetch))) => Ok((
             rest,
             CacheInfo {
-                derivations_to_build: to_build.unwrap_or_else(|| vec![]),
-                derivations_to_fetch: to_fetch.unwrap_or_else(|| vec![]),
+                derivations_to_build: to_build.unwrap_or_else(Vec::new),
+                derivations_to_fetch: to_fetch.unwrap_or_else(Vec::new),
             },
         )),
         Err(e) => Err(e),