Merge pull request #545 from vania-pooh/master

Go 1.18
aerokube · Jul 14, 2022 · 4ab5a20 · 4ab5a20
2 parents 06ee024 + 73c27d1
commit 4ab5a20
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - uses: actions/cache@v1
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - uses: actions/cache@v1
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - uses: actions/cache@v1
         with:

diff --git a/build-chromium.sh b/build-chromium.sh
@@ -10,7 +10,7 @@ docker rmi -f selenoid/vnc:$TAG browsers/base:$BASE_TAG $(docker images -q selen
 rm -rf ../selenoid-container-tests
 
 # Prepare for building images
-go get github.com/markbates/pkger/cmd/pkger
+go install github.com/markbates/pkger/cmd/pkger@latest
 go generate github.com/aerokube/images
 go build
 

diff --git a/ci/build.sh b/ci/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 export GO111MODULE="on"
-go get github.com/markbates/pkger/cmd/pkger
-go get -u github.com/mitchellh/gox # cross compile
+go install github.com/markbates/pkger/cmd/pkger@latest
+go install github.com/mitchellh/gox@latest # cross compile
 go generate github.com/aerokube/images
 GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X github.com/aerokube/images/cmd.buildStamp=$(date -u '+%Y-%m-%d_%I:%M:%S%p') -X github.com/aerokube/images/cmd.gitRevision=$(git describe --tags || git rev-parse HEAD) -s -w"
 gox -os "linux darwin windows" -arch "amd64" -osarch="windows/386" -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags "-X github.com/aerokube/images/cmd.buildStamp=$(date -u '+%Y-%m-%d_%I:%M:%S%p') -X github.com/aerokube/images/cmd.gitRevision=$(git describe --tags || git rev-parse HEAD) -s -w"
diff --git a/docs/building-images.adoc b/docs/building-images.adoc
@@ -14,7 +14,7 @@ Building procedure is automated with a Go binary. All Docker build files are emb
 
 [source,bash]
 ----
-$ go get github.com/markbates/pkger/cmd/pkger
+$ go install github.com/markbates/pkger/cmd/pkger@latest
 $ go generate github.com/aerokube/images
 $ go build
 ----

diff --git a/docs/playwright.adoc b/docs/playwright.adoc
@@ -52,7 +52,10 @@ These images are used to run https://github.com/microsoft/playwright[Playwright]
 | playwright/chromium:playwright-1.22.0 | - | 1.22.0 | 102.0.5005.40
 | playwright/chromium:playwright-1.22.1 | - | 1.22.1 | 102.0.5005.40
 | playwright/chromium:playwright-1.22.2 | playwright/chromium:102.0 | 1.22.2 | 102.0.5005.40
-| playwright/chromium:playwright-1.23.0 | playwright/chromium:104.0 | 1.23.0 | 104.0.5112.20
+| playwright/chromium:playwright-1.23.0 | - | 1.23.0 | 104.0.5112.20
+| playwright/chromium:playwright-1.23.1 | - | 1.23.1 | 104.0.5112.20
+| playwright/chromium:playwright-1.23.2 | - | 1.23.2 | 104.0.5112.20
+| playwright/chromium:playwright-1.23.3 | playwright/chromium:104.0 | 1.23.3 | 104.0.5112.20
 |===
 
 .Chrome Images
@@ -97,7 +100,10 @@ These images are used to run https://github.com/microsoft/playwright[Playwright]
 | playwright/chrome:playwright-1.22.0 | - | 1.22.0 | 101.0.4951.64
 | playwright/chrome:playwright-1.22.1 | - | 1.22.1 | 101.0.4951.64
 | playwright/chrome:playwright-1.22.2 | playwright/chrome:101.0 | 1.22.2 | 101.0.4951.64
-| playwright/chrome:playwright-1.23.0 | playwright/chrome:103.0 | 1.23.0 | 103.0.5060.53
+| playwright/chrome:playwright-1.23.0 | - | 1.23.0 | 103.0.5060.53
+| playwright/chrome:playwright-1.23.1 | - | 1.23.1 | 103.0.5060.53
+| playwright/chrome:playwright-1.23.2 | - | 1.23.2 | 103.0.5060.53
+| playwright/chrome:playwright-1.23.3 | playwright/chrome:103.0 | 1.23.3 | 103.0.5060.53
 |===
 
 .Firefox Images
@@ -150,7 +156,10 @@ These images are used to run https://github.com/microsoft/playwright[Playwright]
 | playwright/firefox:playwright-1.22.0 | - | 1.22.0 | 99.0.1
 | playwright/firefox:playwright-1.22.1 | - | 1.22.1 | 99.0.1
 | playwright/firefox:playwright-1.22.2 | playwright/firefox:99.0 | 1.22.2 | 99.0.1
-| playwright/firefox:playwright-1.23.0 | playwright/firefox:100.0.2 | 1.23.0 | 100.0.2
+| playwright/firefox:playwright-1.23.0 | - | 1.23.0 | 100.0.2
+| playwright/firefox:playwright-1.23.1 | - | 1.23.1 | 100.0.2
+| playwright/firefox:playwright-1.23.2 | - | 1.23.2 | 100.0.2
+| playwright/firefox:playwright-1.23.3 | playwright/firefox:100.0.2 | 1.23.3 | 100.0.2
 |===
 
 .Webkit (Safari Desktop) Images
@@ -203,5 +212,8 @@ These images are used to run https://github.com/microsoft/playwright[Playwright]
 | playwright/webkit:playwright-1.22.0 | - | 1.22.0 | 15.4
 | playwright/webkit:playwright-1.22.1 | - | 1.22.1 | 15.4
 | playwright/webkit:playwright-1.22.2 | - | 1.22.2 | 15.4
-| playwright/webkit:playwright-1.23.0 | playwright/webkit:15.4 | 1.23.0 | 15.4
+| playwright/webkit:playwright-1.23.0 | - | 1.23.0 | 15.4
+| playwright/webkit:playwright-1.23.1 | - | 1.23.1 | 15.4
+| playwright/webkit:playwright-1.23.2 | - | 1.23.2 | 15.4
+| playwright/webkit:playwright-1.23.3 | playwright/webkit:15.4 | 1.23.3 | 15.4
 |===
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aerokube/images
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e
@@ -16,5 +16,5 @@ require (
 	github.com/gobuffalo/here v0.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
+	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
 )
diff --git a/go.sum b/go.sum
@@ -249,8 +249,9 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew=
+golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=