From beb164acf063a63020f617a6d528a187e3cc02e1 Mon Sep 17 00:00:00 2001
From: unclegedd <gedd@defenseunicorns.com>
Date: Thu, 9 May 2024 17:29:54 -0500
Subject: [PATCH] try using brew to install uds cli

---
 .github/actions/install-uds-cli/action.yaml | 13 +++++++++++++
 .github/workflows/nightly-ghcr.yaml         |  3 +++
 .github/workflows/nightly-uds-core.yaml     |  6 ++++++
 .github/workflows/release.yaml              |  5 ++++-
 .github/workflows/scan-codeql.yaml          |  3 +++
 .github/workflows/test-e2e-pr.yaml          |  3 +++
 .github/workflows/test-schema.yaml          |  5 ++++-
 .github/workflows/test-unit.yaml            |  3 +++
 tasks/schema.yaml                           |  2 +-
 9 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 .github/actions/install-uds-cli/action.yaml

diff --git a/.github/actions/install-uds-cli/action.yaml b/.github/actions/install-uds-cli/action.yaml
new file mode 100644
index 00000000..85468f8f
--- /dev/null
+++ b/.github/actions/install-uds-cli/action.yaml
@@ -0,0 +1,13 @@
+name: Install UDS CLI
+description: installs uds-cli from brew
+runs:
+  using: composite
+  steps:
+  - name: Set up Homebrew
+    uses: Homebrew/actions/setup-homebrew@4b34604e75af8f8b23b454f0b5ffb7c5d8ce0056 # master
+
+  - name: Install UDS CLI
+    shell: bash
+    run: |
+      brew tap defenseunicorns/tap
+      brew install uds
diff --git a/.github/workflows/nightly-ghcr.yaml b/.github/workflows/nightly-ghcr.yaml
index a507c055..af4d193e 100644
--- a/.github/workflows/nightly-ghcr.yaml
+++ b/.github/workflows/nightly-ghcr.yaml
@@ -25,6 +25,9 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Build UDS-CLI binary
         run: uds run build-cli-linux-amd
 
diff --git a/.github/workflows/nightly-uds-core.yaml b/.github/workflows/nightly-uds-core.yaml
index ac83fe2e..e8f3705b 100644
--- a/.github/workflows/nightly-uds-core.yaml
+++ b/.github/workflows/nightly-uds-core.yaml
@@ -24,6 +24,12 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup golang
+        uses: ./.github/actions/golang
+
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Build UDS-CLI binary
         run: uds run build-cli-linux-amd
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b5e21b98..a8cfcbbc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,6 +23,9 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Build CLI
         run: |
           uds run build-cli-linux-amd
@@ -72,7 +75,7 @@ jobs:
 
       - name: Run e2e tests
         run: |
-          uds run test:test-e2e
+          build/uds run test:test-e2e
         env:
           GITHUB_TOKEN: secrets.GITHUB_TOKEN
 
diff --git a/.github/workflows/scan-codeql.yaml b/.github/workflows/scan-codeql.yaml
index b9b095f3..882c5528 100644
--- a/.github/workflows/scan-codeql.yaml
+++ b/.github/workflows/scan-codeql.yaml
@@ -41,6 +41,9 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Build UDS CLI
         run: uds run build-cli-linux-amd
 
diff --git a/.github/workflows/test-e2e-pr.yaml b/.github/workflows/test-e2e-pr.yaml
index 0e4bf172..997e88d4 100644
--- a/.github/workflows/test-e2e-pr.yaml
+++ b/.github/workflows/test-e2e-pr.yaml
@@ -30,6 +30,9 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Build UDS-CLI binary
         run: uds run build-cli-linux-amd
 
diff --git a/.github/workflows/test-schema.yaml b/.github/workflows/test-schema.yaml
index 9bcdb13f..910ecab2 100644
--- a/.github/workflows/test-schema.yaml
+++ b/.github/workflows/test-schema.yaml
@@ -15,8 +15,11 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Docs and schemas
-        run: uds run schema:schema schema:test-schema
+        run: uds run schema:test-schema
 
       - name: Save logs
         if: always()
diff --git a/.github/workflows/test-unit.yaml b/.github/workflows/test-unit.yaml
index 56e9fa7e..f238289b 100644
--- a/.github/workflows/test-unit.yaml
+++ b/.github/workflows/test-unit.yaml
@@ -30,6 +30,9 @@ jobs:
       - name: Setup golang
         uses: ./.github/actions/golang
 
+      - name: Install UDS CLI
+        uses: ./.github/actions/install-uds-cli
+
       - name: Run unit tests
         run: uds run test:test-unit
 
diff --git a/tasks/schema.yaml b/tasks/schema.yaml
index 3c14effc..b1e9ee28 100644
--- a/tasks/schema.yaml
+++ b/tasks/schema.yaml
@@ -10,5 +10,5 @@ tasks:
   - name: test-schema
     description: tests if the schema has been modified
     actions:
-      - cmd: ./uds run schema
+      - task: schema
       - cmd: ./hack/test-generate-schema.sh