Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Go 1.18 #545

Merged
merged 4 commits into from
Jul 14, 2022
Merged

Go 1.18 #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8960294
Added latest Playwright images
vania-pooh Jul 14, 2022
569e32c
Bump Golang to 1.18
vania-pooh Jul 14, 2022
5046671
Switched go get commands to go install
vania-pooh Jul 14, 2022
73c27d1
Bump golang.org/x/sys version
vania-pooh Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion build-chromium.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion docs/building-images.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
Expand Down
20 changes: 16 additions & 4 deletions docs/playwright.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
|===
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
)
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down