cicadahq · fedeci · Apr 27, 2023 · Apr 27, 2023 · Apr 27, 2023 · Apr 27, 2023
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 8,10 @@
  "editor.defaultFormatter": "denoland.vscode-deno"
  },
  // Rust
- "rust-analyzer.cargo.features": "all"
  "rust-analyzer.cargo.features": "all",
  "[rust]": {
  "editor.tabSize": 4,
  "editor.insertSpaces": true,
  "editor.detectIndentation": false
  }
 }
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -42,6 42,7 @@ dirs = "5.0.0"
 dotenvy = "0.15.7"
 flate2 = { version = "1.0.25", optional = true, features = ["zlib"]}
 futures = "0.3.28"
 globset = "0.4.10"
 humansize = "2.1.3"
 indicatif = "0.17.3"
 oci-spec = "0.6.0"

diff --git a/crates/cli/src/git.rs b/crates/cli/src/git.rs
@@ -9,6 9,46 @@ pub struct Origin {
  pub url: String,
 }
 
 pub async fn git_uncommitted_files() -> Result<Vec<String>> {
  let output = Command::new("git")
  .args(["status", "--ignored=no", "--short"])
  .output()
  .await?;
 
  if !output.status.success() {
  return Err(anyhow::anyhow!(
  "Failed to get git uncommitted files: {}",
  String::from_utf8_lossy(&output.stderr)
  ));
  };
 
  let changed_files = String::from_utf8(output.stdout)?
  .lines()
  .map(|row| row.trim().split(' ').last().unwrap().to_string())
  .collect();
 
  Ok(changed_files)
 }
 
 pub async fn git_changed_files(base: String, head: String) -> Result<Vec<String>> {
  let output = Command::new("git")
  .args(["--no-pager", "diff", &base, &head, "--name-only"])
  .output()
  .await?;
 
  if !output.status.success() {
  return Err(anyhow::anyhow!(
  "Failed to get git changed files: {}",
  String::from_utf8_lossy(&output.stderr)
  ));
  };
 
  Ok(String::from_utf8(output.stdout)?
  .lines()
  .map(|s| s.to_string())
  .collect())
 }
 
 pub async fn git_remotes() -> Result<Vec<Origin>> {
  let output = Command::new("git").args(["remote", "-v"]).output().await?;
 

diff --git a/crates/cli/src/job.rs b/crates/cli/src/job.rs
@@ -80,6 80,8 @@ pub enum Trigger {
  Options {
  push: Option<TriggerOn>,
  pull_request: Option<TriggerOn>,
  #[serde(default)]
  paths: Vec<String>,
  },
  DenoFunction,
 }

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
@@ -32,13 32,14 @@ use url::Url;
 
 use ahash::{HashMap, HashMapExt};
 use clap::Parser;
 use globset::{Glob, GlobSetBuilder};
 use owo_colors::{OwoColorize, Stream};
 use tokio::{io::AsyncWriteExt, process::Command};
 
 use crate::{
  bin_deps::{buildctl_exe, deno_exe, BUILDKIT_VERSION},
  dag::{invert_graph, topological_sort, Node},
- git::github_repo,
  git::{git_changed_files, git_uncommitted_files, github_repo},
  job::{CicadaType, InspectInfo, JobResolved, OnFail, Pipeline, TriggerOn},
 };
 
@@ -467,35 468,68 @@ impl Commands {
  std::env::var("CICADA_BASE_REF"),
  ) {
  (Ok(git_event), Ok(base_ref)) => match pipeline.on {
- Some(job::Trigger::Options { push, pull_request }) => match &*git_event {
- "pull_request" => {
- if let Some(TriggerOn::Branches { branches }) = &pull_request {
- if !branches.contains(&base_ref) {
- info!(
- "Skipping pipeline because branch {} is not in {}: {:?}",
- base_ref.bold(),
- "pull_request".bold(),
- pull_request
- );
- std::process::exit(2);
  Some(job::Trigger::Options {
  push,
  pull_request,
  paths,
  }) => {
  match &*git_event {
  "pull_request" => {
  if let Some(TriggerOn::Branches { branches }) = &pull_request {
  if !branches.contains(&base_ref) {
  info!(
  "Skipping pipeline because branch {} is not in {}: {:?}",
  base_ref.bold(),
  "pull_request".bold(),
  pull_request
  );
  std::process::exit(2);
  }
  }
  }
- }
- "push" => {
- if let Some(TriggerOn::Branches { branches }) = &push {
- if !branches.contains(&base_ref) {
- info!(
  "push" => {
  if let Some(TriggerOn::Branches { branches }) = &push {
  if !branches.contains(&base_ref) {
  info!(
  "Skipping pipeline because branch {} is not in {}: {:?}",
  base_ref.bold(),
  "push".bold(),
  push
  );
- std::process::exit(2);
  std::process::exit(2);
  }
  }
  }
  _ => (),
  }
- _ => {}
- },
 
  if !paths.is_empty() {
  let globset = {
  let mut builder = GlobSetBuilder::new();
  for path in paths.iter() {
  builder.add(Glob::new(path)?);
  }
  builder.build()?
  };
  let changed_files = match (
  std::env::var("CICADA_GIT_BASE"),
  std::env::var("CICADA_GIT_HEAD"),
  ) {
  (Ok(base), Ok(head)) => git_changed_files(base, head).await?,
  _ => git_uncommitted_files().await?,
  };
  let matching_files =
  changed_files.iter().any(|f| globset.is_match(f));
 
  if !matching_files {
  info!(
  "Skipping pipeline because no changed file is matching paths: {:?}",
  paths
  );
  std::process::exit(2);
  }
  }
  }
  Some(job::Trigger::DenoFunction) => {
  anyhow::bail!("TypeScript trigger functions are unimplemented")
  }

diff --git a/lib/mod.ts b/lib/mod.ts
@@ -37,6 37,16 @@ import { DockerImages } from "https://deno.land/x/cicada/types/dockerImages.ts";
  */
 export type FilePath = string;
 
 /**
  * A glob representing more or one path.
  *
  * @example
  * ```ts
  * const glob: Glob = "src/*.ts"
  * ```
  */
 export type Glob = string;
 
 /**
  * Options for a cached directory
  *
@@ -284,6 294,10 @@ export interface TriggerOptions {
  * Use `'all'` if you'd like for any branch to trigger the pipeline.
  */
  pullRequest?: Branch[] | "all";
  /**
  * Which paths should trigger the pipeline on a push or pullRequest.
  */
  paths?: Glob[];
 }
 
 /**