From 5f1d548d762cfc7f996f8f06ddd93e7a6029e4f7 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Oct 2022 13:21:08 +0200 Subject: [PATCH 1/4] ci: bump go version --- .github/workflows/unit-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index c0a6c5432f..883209610a 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -7,7 +7,7 @@ jobs: os-tests: strategy: matrix: - go-version: [1.16.x, 1.17.x] + go-version: [1.17.x, 1.18.x] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: From 527c06a3cda27c16ba6d7f904e27891aeae8a693 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Oct 2022 13:36:53 +0200 Subject: [PATCH 2/4] fix(main): check for empty buildinfo version --- cmd/scw/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/scw/main.go b/cmd/scw/main.go index a531c1dae3..b41f35a025 100644 --- a/cmd/scw/main.go +++ b/cmd/scw/main.go @@ -6,6 +6,7 @@ import ( "runtime" "runtime/debug" + "github.com/davecgh/go-spew/spew" "github.com/hashicorp/go-version" "github.com/mattn/go-colorable" "github.com/scaleway/scaleway-cli/v2/internal/core" @@ -47,7 +48,8 @@ func cleanup(buildInfo *core.BuildInfo) { func buildVersion() string { if Version == "" { buildInfos, ok := debug.ReadBuildInfo() - if ok && buildInfos.Main.Version != "(devel)" { + spew.Dump(buildInfos.Main) + if ok && buildInfos.Main.Version != "(devel)" && buildInfos.Main.Version != "" { return buildInfos.Main.Version } return "v2+dev" From 5ff705c56cd5072007525c9e87cc0f708bbbc860 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Oct 2022 13:39:27 +0200 Subject: [PATCH 3/4] ci: bump build version --- .github/workflows/unit-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 883209610a..60e334f363 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -31,7 +31,7 @@ jobs: build-tests: strategy: matrix: - go-version: [1.16.x, 1.17.x] + go-version: [1.17.x, 1.18.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: From d438332dd123d26f55bec6f9cff2991c0382a696 Mon Sep 17 00:00:00 2001 From: Jules Casteran Date: Tue, 4 Oct 2022 13:50:41 +0200 Subject: [PATCH 4/4] remove debug --- cmd/scw/main.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/scw/main.go b/cmd/scw/main.go index b41f35a025..1f3f73165f 100644 --- a/cmd/scw/main.go +++ b/cmd/scw/main.go @@ -6,7 +6,6 @@ import ( "runtime" "runtime/debug" - "github.com/davecgh/go-spew/spew" "github.com/hashicorp/go-version" "github.com/mattn/go-colorable" "github.com/scaleway/scaleway-cli/v2/internal/core" @@ -48,7 +47,6 @@ func cleanup(buildInfo *core.BuildInfo) { func buildVersion() string { if Version == "" { buildInfos, ok := debug.ReadBuildInfo() - spew.Dump(buildInfos.Main) if ok && buildInfos.Main.Version != "(devel)" && buildInfos.Main.Version != "" { return buildInfos.Main.Version }