From fafe23cda66e2cc6cbfe4627981aae04835013d4 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 27 Jul 2024 15:05:33 -0400 Subject: [PATCH] local ci: add intel mac --- packages/ci/layout.kdl | 5 +++++ packages/om-ci-build-remote.nix | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/ci/layout.kdl b/packages/ci/layout.kdl index e9a429d..d863152 100644 --- a/packages/ci/layout.kdl +++ b/packages/ci/layout.kdl @@ -16,6 +16,11 @@ layout { command "om-ci-build-remote" args "nix-infra@sambar" } + pane { + name "x86_64-darwin" + command "om-ci-build-remote" + args "nix-infra@sambar" "--systems" "x86_64-darwin" + } } pane size=2 borderless=true { plugin location="status-bar" diff --git a/packages/om-ci-build-remote.nix b/packages/om-ci-build-remote.nix index 47dfbb5..98f0e05 100644 --- a/packages/om-ci-build-remote.nix +++ b/packages/om-ci-build-remote.nix @@ -5,15 +5,15 @@ writeShellApplication { name = "om-ci-build-remote"; runtimeInputs = [ jq nix ]; meta.description = '' - `nixci build`, but build remotely over SSH. + `om ci build`, but build remotely over SSH. ''; # TODO: This should handle --override-inputs text = '' FLAKE=$(nix flake metadata --json | jq -r .path) set -x - nix copy --to "ssh://$1" "$FLAKE" - nix copy --to "ssh://$1" ${inputs.omnix} + HOST="$1"; shift + nix copy --to "ssh://$HOST" ${inputs.omnix} "$FLAKE" # shellcheck disable=SC2029 - ssh "$1" nix run ${inputs.omnix}#default ci build "$FLAKE" + ssh "$HOST" nix run ${inputs.omnix}#default -- ci build "$FLAKE" "$@" ''; }