diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 27b50a6d..b5f8057f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16.x + go-version: 1.18.x - name: Check out repository code uses: actions/checkout@v2 - name: Install gotestsum diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 1c0cecd7..3db19d3a 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,15 +12,13 @@ blocks: - name: Build local CLIs dependencies: [] task: - prologue: - commands: - - sem-version go 1.16 - - "export GOPATH=~/go" - - "export PATH=/home/semaphore/go/bin:$PATH" - - checkout jobs: - name: Build cache CLI commands: + - sem-version go 1.18 + - "export GOPATH=~/go" + - "export PATH=/home/semaphore/go/bin:$PATH" + - checkout - cd cache-cli - make build.linux - make build.darwin @@ -30,6 +28,10 @@ blocks: - artifact push workflow bin/windows/cache.exe -d bin/windows/cache.exe - name: Build sem-context CLI commands: + - sem-version go 1.17 + - "export GOPATH=~/go" + - "export PATH=/home/semaphore/go/bin:$PATH" + - checkout - cd sem-context - make build.linux - make build.darwin @@ -358,12 +360,12 @@ blocks: value: "on" prologue: commands: - - sem-version go 1.16 + - sem-version go 1.18 - checkout && cd cache-cli jobs: - name: Lint commands: - - go get -u github.com/mgechev/revive + - go install github.com/mgechev/revive@latest - make lint - name: "Cache CLI: Security checks" diff --git a/cache-cli/Dockerfile.dev b/cache-cli/Dockerfile.dev index 6b756bc7..a88cea16 100644 --- a/cache-cli/Dockerfile.dev +++ b/cache-cli/Dockerfile.dev @@ -1,6 +1,6 @@ -FROM golang:1.16 +FROM golang:1.18 -RUN go get gotest.tools/gotestsum +RUN go install gotest.tools/gotestsum@latest RUN mkdir /root/.ssh COPY id_rsa /root/.ssh/semaphore_cache_key diff --git a/cache-cli/go.mod b/cache-cli/go.mod index 853bbe1f..b71ddcfc 100644 --- a/cache-cli/go.mod +++ b/cache-cli/go.mod @@ -1,6 +1,6 @@ module github.com/semaphoreci/toolbox/cache-cli -go 1.16 +go 1.18 require ( github.com/aws/aws-sdk-go-v2 v1.9.0 @@ -15,4 +15,22 @@ require ( golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 ) +require ( + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.3.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.7.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.4.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.7.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/kr/fs v0.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) + replace golang.org/x/text v0.3.6 => golang.org/x/text v0.3.7 diff --git a/cache-cli/go.sum b/cache-cli/go.sum index 546b095b..2fc38b67 100644 --- a/cache-cli/go.sum +++ b/cache-cli/go.sum @@ -355,7 +355,6 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -419,7 +418,6 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= @@ -433,7 +431,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/cache-cli/lint.toml b/cache-cli/lint.toml index 34bf477f..b711733f 100644 --- a/cache-cli/lint.toml +++ b/cache-cli/lint.toml @@ -16,10 +16,12 @@ warningCode = 1 [rule.increment-decrement] [rule.var-naming] [rule.var-declaration] -[rule.package-comments] [rule.range] [rule.receiver-naming] [rule.time-naming] [rule.unexported-return] [rule.indent-error-flow] [rule.errorf] + +[rule.package-comments] + Disabled = true \ No newline at end of file diff --git a/sem-context/Dockerfile.dev b/sem-context/Dockerfile.dev index 447180b1..c794c773 100644 --- a/sem-context/Dockerfile.dev +++ b/sem-context/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 RUN go get gotest.tools/gotestsum