Merge pull request #807 from overmindtech/copybara

Project import generated by Copybara.

Author: DavidS-ovm

.github/actions/go_init/action.yml

@@ -4,6 +4,7 @@ Set Width 1920
 Set Height 1080
 
 Set FontSize 12
+Set CursorBlink false
 
 Hide
 Type "export PATH=$PWD:$PATH"

.github/e2eapply.tape

@@ -4,6 +4,7 @@ Set Width 1920
 Set Height 1080
 
 Set FontSize 12
+Set CursorBlink false
 
 Hide
 Type "export PATH=$PWD:$PATH"

.github/e2eplan.tape

@@ -39,8 +39,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go Init
-        uses: ./.github/actions/go_init
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.x
+          check-latest: true
+          cache: true
 
       - name: Build the binary
         run: |
@@ -120,8 +124,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go Init
-        uses: ./.github/actions/go_init
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.x
+          check-latest: true
+          cache: true
 
       - name: Build the binary
         run: |

.github/renovate.json

@@ -19,13 +19,13 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go Init
-        uses: ./.github/actions/go_init
+      - name: Set up Go
+        uses: actions/setup-go@v5
         with:
+          go-version: 1.x
+          check-latest: true
           cache: true
 
-      - run: go run main.go --version
-
       - name: Run GoReleaser (publish)
         uses: goreleaser/goreleaser-action@v6
         with:
@@ -71,4 +71,4 @@ jobs:
           livecheck: true
           user_name: CLI Release Bot
           user_email: [email protected]
-      
+

.github/workflows/e2e.yaml

@@ -15,10 +15,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go Init
-        uses: ./.github/actions/go_init
-
-      - run: go run main.go --version
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.x
+          check-latest: true
+          cache: true
 
       - name: Run GoReleaser (dry run)
         uses: goreleaser/goreleaser-action@v6

.github/workflows/release.yml

@@ -13,39 +13,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Go Init
-        uses: ./.github/actions/go_init
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.x
+          check-latest: true
+          cache: true
 
       - name: Go Test
         run: |
           go run main.go --version
-          go test -v -timeout 5m ./...
-
-  golangci:
-    name: lint
-    runs-on: depot-ubuntu-22.04-4
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Go Init
-        uses: ./.github/actions/go_init
-
-      # get .golangci.yml from github.com/overmindtech/golangci-lint_config
-      - name: Get .golangci.yml from github.com/overmindtech/golangci-lint_configs
-        run: |
-          curl -sfL https://raw.githubusercontent.com/overmindtech/golangci-lint_config/main/.golangci.yml -o .golangci.yml
-
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.60.1
-          args: --timeout 3m
-          skip-pkg-cache: true # golangci-lint-action caching conflicts with the setup-go cache and `go get` above. See https://github.com/golangci/golangci-lint-action/issues/23
+          go test -v -timeout 5m github.com/overmindtech/cli github.com/overmindtech/cli/tfutils

.github/workflows/test_release.yml

@@ -8,17 +8,16 @@ builds:
     goos:
       - linux
       - windows
-    # Set the version where the binary will look it up (ServiceVersion) without ruining the flags goreleaser is setting
     ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser -X github.com/overmindtech/cli/tracing.ServiceVersion={{.Version}}
+      - -s -w -X github.com/overmindtech/cli/tracing.version={{.Version}}
   - binary: overmind
     id: overmind-macos
     env:
       - CGO_ENABLED=0
     goos:
       - darwin
     ldflags:
-      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser -X github.com/overmindtech/cli/tracing.ServiceVersion={{.Version}}
+      - -s -w -X github.com/overmindtech/cli/tracing.version={{.Version}}
 
 # For now we are going to disable signing MacOS packages. This works on Dylan's
 # person laptop, but we haven't worked out a way to get this set up in a github