fix: remove Go action and use Go cache for Windows (#3097)

Signed-off-by: Philip Laine <philip.laine@gmail.com>
zarf-dev · Oct 15, 2024 · 08f04c0 · 08f04c0
1 parent 59ee9e0
commit 08f04c0
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 30 deletions.
diff --git a/.github/actions/golang/action.yaml b/.github/actions/golang/action.yaml
diff --git a/.github/workflows/check-go-mod.yml b/.github/workflows/check-go-mod.yml
@@ -14,7 +14,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Test go mod
         run: |

diff --git a/.github/workflows/nightly-ecr.yml b/.github/workflows/nightly-ecr.yml
@@ -22,7 +22,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Build the Zarf binary
         run: make build-cli-linux-amd

diff --git a/.github/workflows/nightly-eks.yml b/.github/workflows/nightly-eks.yml
@@ -30,7 +30,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Build binary and zarf packages
         uses: ./.github/actions/packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,9 @@ jobs:
           fetch-depth: 0
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Install tools
         uses: ./.github/actions/install-tools
@@ -107,7 +109,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Make Zarf executable
         run: |
@@ -140,7 +144,9 @@ jobs:
           fetch-depth: 0
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Install tools
         uses: ./.github/actions/install-tools

diff --git a/.github/workflows/scan-codeql.yml b/.github/workflows/scan-codeql.yml
@@ -39,7 +39,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/scan-docs-and-schema.yml b/.github/workflows/scan-docs-and-schema.yml
@@ -14,7 +14,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Docs and schemas
         run: "make test-docs-and-schema"

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -38,7 +38,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Build binary and zarf packages
         uses: ./.github/actions/packages
@@ -67,7 +69,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Make Zarf executable
         run: |
@@ -102,7 +106,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Setup K3d
         uses: ./.github/actions/k3d
@@ -144,7 +150,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Make Zarf executable
         run: |
@@ -182,7 +190,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Setup Kind
         run: |
@@ -226,7 +236,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Setup Minikube
         run: minikube start --driver=docker

diff --git a/.github/workflows/test-external.yml b/.github/workflows/test-external.yml
@@ -37,7 +37,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Build binary and zarf packages
         uses: ./.github/actions/packages

diff --git a/.github/workflows/test-import.yaml b/.github/workflows/test-import.yaml
@@ -20,8 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version-file: 'go.mod'
-          cache: true
+          go-version-file: go.mod
 
       - name: Run test Go program that imports Zarf
         run: |

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -41,7 +41,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Run unit tests
         run: make test-unit

diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml
@@ -37,7 +37,9 @@ jobs:
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Build PR binary and zarf init package
         uses: ./.github/actions/packages
@@ -66,7 +68,9 @@ jobs:
           path: build/
 
       - name: Setup golang
-        uses: ./.github/actions/golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
 
       - name: Make Zarf executable
         run: |

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -36,6 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
+      - name: Setup golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
+
       - name: Run Windows unit tests
         run: make test-unit
         shell: pwsh
@@ -46,6 +51,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
+      - name: Setup golang
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+        with:
+          go-version-file: go.mod
+
       - name: Build Windows binary and zarf packages
         uses: ./.github/actions/packages
         with: