try using brew to install uds cli

defenseunicorns · May 9, 2024 · beb164a · beb164a
1 parent 43b8dee
commit beb164a
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 3 deletions.
diff --git a/.github/actions/install-uds-cli/action.yaml 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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