reorder some stesp, colima delete

hofstadter-io · Aug 25, 2023 · e5acba7 · e5acba7
1 parent d03004f
commit e5acba7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/hof.yml b/.github/workflows/hof.yml
@@ -46,14 +46,11 @@ jobs:
           fi
           echo "HOF_SHA=${SHA}" >> $GITHUB_ENV
           echo "HOF_TAG=${TAG}" >> $GITHUB_ENV
-      - name: Fetch Go deps
-        run: go mod download
-      - name: Build CLI
-        run: go install ./cmd/hof
       - name: Setup Docker on MacOS
         run: |-
           brew reinstall -f --force-bottle qemu lima colima docker
           limactl info
+          colima delete
           colima start debug --cpu 3 --memory 10 --disk 12
         if: ${{ startsWith( runner.os, 'macos') }}
       - name: Setup MacOS docker socket
@@ -65,6 +62,10 @@ jobs:
           docker info
           docker context ls
           go run test/docker/main.go
+      - name: Fetch Go deps
+        run: go mod download
+      - name: Build CLI
+        run: go install ./cmd/hof
       - name: Build Formatters
         run: |-
           make formatters

diff --git a/ci/gha/common/steps.cue b/ci/gha/common/steps.cue
@@ -97,9 +97,10 @@ Steps: {
 				name: "Set up Docker Colima"
 				// colima settings based on github default macos worker
 				run: """
-					brew reinstall -f --force-bottle qemu
-					brew install docker colima
-					colima start --cpu 3 --memory 10 --disk 12
+					brew reinstall -f --force-bottle qemu lima colima docker
+					limactl info
+					colime delete
+					colima start debug --cpu 3 --memory 10 --disk 12
 					"""
 			}
 		}
@@ -145,6 +146,7 @@ Steps: {
 			run: """
 				brew reinstall -f --force-bottle qemu lima colima docker
 				limactl info
+				colima delete
 				colima start debug --cpu 3 --memory 10 --disk 12
 				"""
 			"if": "${{ startsWith( runner.os, 'macos') }}"

diff --git a/ci/gha/hof.cue b/ci/gha/hof.cue
@@ -29,15 +29,18 @@ ghacue.#Workflow & {
 			common.Steps.go.cache,
 			common.Steps.checkout,
 			common.Steps.vars,
+
+			// common.Steps.docker.setup,
+			common.Steps.docker.machack,
+			common.Steps.docker.macos,
+			common.Steps.docker.compat,
+
+			// application steps
 			common.Steps.go.deps,
 			{
 				name: "Build CLI"
 				run:  "go install ./cmd/hof"
 			},
-			// common.Steps.docker.setup,
-			common.Steps.docker.machack,
-			common.Steps.docker.macos,
-			common.Steps.docker.compat,
 			{
 				name: "Build Formatters"
 				run: """