diff --git a/.github/workflows/code_scanners.yml b/.github/workflows/code_scanners.yml index fa5e2b15..e956bed5 100644 --- a/.github/workflows/code_scanners.yml +++ b/.github/workflows/code_scanners.yml @@ -8,7 +8,7 @@ on: - master env: - GO_VERSION: 1.21 + GO_VERSION: 1.22 permissions: @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.21.5" + go-version: "1.22.0" cache: false - name: Install Task run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9b915ebb..350b660b 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -11,7 +11,7 @@ jobs: test: strategy: matrix: - go: [ {version: 1.21.5, token: 1}, {version: 1.21.5, token: 0}] + go: [ {version: 1.22.0, token: 1}, {version: 1.22.0, token: 0}] grafana: [ 10.1.4 ] env: @@ -40,11 +40,11 @@ jobs: run: | echo "token IS $TEST_TOKEN_CONFIG" - name: Calc coverage - if: "${{ matrix.go.version == '1.21.5' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}" + if: "${{ matrix.go.version == '1.22.0' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}" run: | go test -v -covermode=atomic -coverprofile=coverage.out ./... - name: Convert coverage.out to coverage.lcov - if: "${{ matrix.go.version == '1.21.5' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}" + if: "${{ matrix.go.version == '1.22.0' && matrix.grafana == '10.1.4' && matrix.go.token == '0' }}" uses: jandelgado/gcov2lcov-action@v1.0.9 - name: Test if: "${{ matrix.go.token == '1' }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 633795bd..e460df7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Log in to Docker Hub uses: docker/login-action@v2 with: diff --git a/go.mod b/go.mod index a98f106a..c940c772 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/esnet/gdg -go 1.21.5 +go 1.22.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 @@ -103,7 +103,7 @@ require ( github.com/gosimple/unidecode v1.0.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/huandu/xstrings v1.4.0 // indirect - github.com/imdario/mergo v0.3.16 // indirect + github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect diff --git a/go.sum b/go.sum index ee38b010..804d883b 100644 --- a/go.sum +++ b/go.sum @@ -234,8 +234,8 @@ github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= +github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jedib0t/go-pretty/v6 v6.4.9 h1:vZ6bjGg2eBSrJn365qlxGcaWu09Id+LHtrfDWlB2Usc= @@ -572,6 +572,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= diff --git a/internal/version/version.go b/internal/version/version.go index f63c92c8..f20a5af2 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -8,8 +8,8 @@ import ( // GitCommit returns the git commit that was compiled. This will be filled in by the compiler. var GitCommit string -// Version returns the main version number that is being run at the moment. -var Version = "0.5.1" +// Version returns current version. Set to release CICD +var Version = "DEVEL" // BuildDate returns the date the binary was built var BuildDate = ""