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

Update playground to require Go 1.20 to match SDK. #27757

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Update playground to require Go 1.20 to match SDK. #27757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 playground/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build, test, and deploy the frontend and backend services.
> - buf
> - sbt

1. Install Go 1.18+
1. Install Go 1.20+

**Ubuntu 22.04 and newer:**
```shell
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/go/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ docker {
buildArgs(
['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ?
project.rootProject["base-image"] :
"golang:1.18-bullseye",
"golang:1.20-bullseye",
'SDK_TAG' : project.rootProject.hasProperty(["sdk-tag"]) ?
project.rootProject["sdk-tag"] : project.rootProject.sdk_version,
'SDK_TAG_LOCAL': project.rootProject.sdk_version,
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
ARG BEAM_VERSION=2.44.0
FROM golang:1.18-bullseye AS build
FROM golang:1.20-bullseye AS build
ARG BEAM_VERSION
ARG GIT_COMMIT="<unknown>"
ARG GIT_TIMESTAMP="0"
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
ARG GO_BASE_IMAGE=golang:1.18-bullseye
ARG GO_BASE_IMAGE=golang:1.20-bullseye
ARG SDK_TAG
ARG BASE_IMAGE=apache/beam_python3.10_sdk:$SDK_TAG
FROM $GO_BASE_IMAGE AS build
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/python/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ docker {
buildArgs(
['GO_BASE_IMAGE': project.rootProject.hasProperty(["go-base-image"]) ?
project.rootProject["go-base-image"] :
"golang:1.18-bullseye",
"golang:1.20-bullseye",
'SDK_TAG' : project.rootProject.hasProperty(["sdk-tag"]) ?
project.rootProject["sdk-tag"] : default_beam_version,
'GIT_COMMIT' : getGitCommitHash(),
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/router/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
#Dokerfile to set up the Beam Go SDK
ARG BASE_IMAGE=golang:1.18-bullseye
ARG BASE_IMAGE=golang:1.20-bullseye
#Two-stage assembly
FROM $BASE_IMAGE AS build
ARG GIT_COMMIT="<unknown>"
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/router/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ docker {
tags containerImageTags()
buildArgs(['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ?
project.rootProject["base-image"] :
"golang:1.18-bullseye",
"golang:1.20-bullseye",
'GIT_COMMIT' : getGitCommitHash(),
'GIT_TIMESTAMP': getGitCommitTimestamp()])
}
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/scio/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
ARG BASE_IMAGE=openjdk:11
FROM golang:1.18-bullseye AS build
FROM golang:1.20-bullseye AS build
ARG GIT_COMMIT="<unknown>"
ARG GIT_TIMESTAMP="0"

Expand Down
2 changes: 1 addition & 1 deletion playground/backend/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

module beam.apache.org/playground/backend

go 1.18
go 1.20

require (
cloud.google.com/go/datastore v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion playground/frontend/playground_components/tools/extract_symbols_go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

module beam.apache.org/playground/extract_symbols_go

go 1.18
go 1.20

require gopkg.in/yaml.v2 v2.4.0 // indirect
2 changes: 1 addition & 1 deletion playground/infrastructure/cloudbuild/playground_ci_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export STEP=CI
export SDK_CONFIG="$BEAM_ROOT_DIR/playground/sdks.yaml"
export BEAM_EXAMPLE_CATEGORIES="$BEAM_ROOT_DIR/playground/categories.yaml"
export GRADLE_VERSION=7.5.1
export GO_VERSION=1.18
export GO_VERSION=1.20

LogOutput "Installing python java8 and dependencies"
apt-get update > /dev/null
Expand Down