From c022ff7c2d3c17418b0c048d50473e7120eb298d Mon Sep 17 00:00:00 2001 From: George Kudrayvtsev Date: Wed, 15 Mar 2023 16:32:28 -0700 Subject: [PATCH 1/2] Is it Go 1.20 time?? :eyes: --- .github/workflows/go.yml | 9 +++++---- .github/workflows/horizon-release.yml | 2 +- .github/workflows/horizon.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d51aa03def..f11264b1c2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -18,7 +18,8 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - go: [1.19.4] + # lmao semvers aren't floats never 4get + go: ["1.19", "1.20"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -38,7 +39,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - go: [1.18.6, 1.19.4] + go: ["1.19", "1.20"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -56,7 +57,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - go: [1.18.6, 1.19.4] + go: ["1.19", "1.20"] pg: [9.6.5, 10] runs-on: ${{ matrix.os }} services: @@ -82,7 +83,7 @@ jobs: --health-retries 5 ports: - 6379:6379 - env: + env: PGHOST: localhost PGPORT: 5432 PGUSER: postgres diff --git a/.github/workflows/horizon-release.yml b/.github/workflows/horizon-release.yml index 7909d6a98e..bcc76309c8 100644 --- a/.github/workflows/horizon-release.yml +++ b/.github/workflows/horizon-release.yml @@ -22,7 +22,7 @@ jobs: - uses: ./.github/actions/setup-go with: - go-version: 1.19.4 + go-version: "1.20" - name: Check dependencies run: ./gomod.sh diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 25236bf88b..efe06ab996 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - go: [1.18.6, 1.19.4] + go: ["1.19", "1.20"] pg: [9.6.5] ingestion-backend: [db, captive-core, captive-core-remote-storage] protocol-version: [19, 20] From c56be904081f94e3f8f8b21d1f42e606c80892d6 Mon Sep 17 00:00:00 2001 From: George Kudrayvtsev Date: Wed, 15 Mar 2023 17:05:36 -0700 Subject: [PATCH 2/2] Yeet staticcheck upgrade --- staticcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staticcheck.sh b/staticcheck.sh index 139ccb6e45..7e2eb41f28 100755 --- a/staticcheck.sh +++ b/staticcheck.sh @@ -1,7 +1,7 @@ #! /bin/bash set -e -version='2022.1' +version='2023.1' staticcheck='go run honnef.co/go/tools/cmd/staticcheck@'"$version"