From 2e8e453f0fc3851503a8cb408a9bad3793905602 Mon Sep 17 00:00:00 2001 From: mchavez Date: Wed, 10 Jul 2024 09:19:25 -0600 Subject: [PATCH] Update go version in tests. Fix goreleaser. --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/main.yaml | 4 ++-- .github/workflows/release.yaml | 12 ++++++------ .goreleaser.docker.yaml | 3 ++- .goreleaser.yaml | 5 +++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0941f21..502148b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.22.x - name: Checkout code uses: actions/checkout@v3 - name: Run linters @@ -18,7 +18,7 @@ jobs: go-test: strategy: matrix: - go-version: [1.20.x] + go-version: [1.22.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 2508a62..b0c1ce1 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,7 +10,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.22.x - name: Checkout code uses: actions/checkout@v3 - name: Run linters @@ -21,7 +21,7 @@ jobs: go-test: strategy: matrix: - go-version: [ 1.20.x ] + go-version: [ 1.22.x ] platform: [ ubuntu-latest ] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c020b41..3aef76c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.22.x - name: Set up Gon run: brew tap conductorone/gon && brew install conductorone/gon/gon - name: Import Keychain Certs @@ -25,9 +25,9 @@ jobs: p12-file-base64: ${{ secrets.APPLE_SIGNING_KEY_P12 }} p12-password: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: - version: latest + version: "~> v2" args: release --clean env: GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} @@ -43,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.22.x - name: Docker Login uses: docker/login-action@v1 with: @@ -53,9 +53,9 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: - version: latest + version: "~> v2" args: release --clean -f .goreleaser.docker.yaml env: GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} \ No newline at end of file diff --git a/.goreleaser.docker.yaml b/.goreleaser.docker.yaml index d93b594..de3ecd9 100644 --- a/.goreleaser.docker.yaml +++ b/.goreleaser.docker.yaml @@ -1,3 +1,4 @@ +version: 2 project_name: baton-hubspot builds: - binary: baton-hubspot @@ -51,4 +52,4 @@ checksum: release: disable: true changelog: - skip: true \ No newline at end of file + disable: true \ No newline at end of file diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 08c493d..59d2f2f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +version: 2 project_name: baton-hubspot builds: - binary: baton-hubspot @@ -65,10 +66,10 @@ checksum: - glob: ./dist/*-darwin-amd64.zip - glob: ./dist/*-darwin-arm64.zip brews: - - tap: + - repository: owner: conductorone name: homebrew-baton - folder: Formula + directory: Formula homepage: https://conductorone.com test: | system "#{bin}/baton-hubspot -v"