From 8e60fcc4d4567854cabbc95bb2e7a864d9ddcb7f Mon Sep 17 00:00:00 2001 From: Ivan Krutov Date: Fri, 19 May 2023 10:09:38 +0300 Subject: [PATCH] Bump Golang to 1.20 and updated action versions (fixes #518) --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/release.yml | 10 +++++----- .github/workflows/test.yml | 16 ++++++++-------- ci/test.sh | 2 +- go.mod | 8 ++++---- go.sum | 17 ++++++----------- 6 files changed, 30 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03c8671d..f3808d91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,20 +9,20 @@ jobs: selenoid-ui: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set Golang - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: ~1.19.3 + go-version: ~1.20.4 - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 12.x @@ -30,7 +30,7 @@ jobs: id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd829848..acb23624 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,20 +8,20 @@ jobs: selenoid-ui: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set Golang uses: actions/setup-go@v2 with: - go-version: ~1.19.3 + go-version: ~1.20.4 - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 12.x @@ -29,7 +29,7 @@ jobs: id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90276c33..6acfcf89 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,20 +7,20 @@ jobs: selenoid-ui: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set Golang - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: ~1.19.3 + go-version: ~1.20.4 - - uses: actions/cache@v1 + - uses: actions/cache@v3 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 12.x @@ -28,7 +28,7 @@ jobs: id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v1 + - uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -39,11 +39,11 @@ jobs: - name: Test run: ci/test.sh - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: flags: go - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: file: ./ui/coverage/coverage-final.json flags: ui diff --git a/ci/test.sh b/ci/test.sh index 02a097a4..761d10ff 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -10,4 +10,4 @@ go generate github.com/aerokube/selenoid-ui go test -race -v -coverprofile=coverage.txt -covermode=atomic ./... go install golang.org/x/vuln/cmd/govulncheck@latest -"$(go env GOPATH)"/bin/govulncheck -tags production ./... +"$(go env GOPATH)"/bin/govulncheck ./... diff --git a/go.mod b/go.mod index 634b0a59..a5ea4258 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/aerokube/selenoid-ui -go 1.19 +go 1.20 require ( github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e github.com/abbot/go-http-auth v0.4.0 - github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09 + github.com/aerokube/util v1.0.0 github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c github.com/rakyll/statik v0.1.7 ) require ( github.com/gorilla/websocket v1.5.0 // indirect - golang.org/x/crypto v0.3.0 // indirect - golang.org/x/net v0.2.0 // indirect + golang.org/x/crypto v0.9.0 // indirect + golang.org/x/net v0.10.0 // indirect ) diff --git a/go.sum b/go.sum index f434521f..34f9b9df 100644 --- a/go.sum +++ b/go.sum @@ -4,24 +4,19 @@ github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0E github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM= github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09 h1:T3Y7aciF+tYzT5wXHiwhLQNEozQHiyNDYXYDbi6EN2g= github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09/go.mod h1:a1duJwYg3lfxakFPqpJsD41PYdkBmeUFPA4S+ISkHhQ= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/aerokube/util v1.0.0 h1:46fky7Wr6lf7ozksiLPEs0fM+3Z2cjeBI3FZT/3H1QQ= +github.com/aerokube/util v1.0.0/go.mod h1:0shrio3aqMNAzf2mUewcOaLKql3ijfTsPQnMUnydj40= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c h1:N7A4JCA2G+j5fuFxCsJqjFU/sZe0mj8H0sSoSwbaikw= github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c/go.mod h1:Nn5wlyECw3iJrzi0AhIWg+AJUb4PlRQVW4/3XHH1LZA= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20201002094018-c90954cbb977 h1:yH6opeNE+0SY+7pXT4gclZUoKHogXeC2EvOSHGOMGPU= -golang.org/x/crypto v0.0.0-20201002094018-c90954cbb977/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20211008194852-3b03d305991f h1:1scJEYZBaF48BaG6tYbtxmLcXqwYGSfGcMoStTqkkIw= -golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=