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

Set bootstrap version to 14.12 with go 1.20.13 #179

Closed
wants to merge 4 commits into from
Closed

Set bootstrap version to 14.12 with go 1.20.13 #179

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
159f725
Set bootstrap version to 14.12 with go 1.20.13
ejortegau Jan 17, 2024
9976f0c
Print go version before building
ejortegau Jan 17, 2024
606108f
Set default bootstrap version in test.go to 14.12
ejortegau Jan 18, 2024
ce8e394
Set Go version for static code checks
ejortegau Jan 18, 2024
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/static_checks_etc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
if: steps.skip-workflow.outputs.skip-workflow == 'false' && (steps.changes.outputs.go_files == 'true' || steps.changes.outputs.parser_changes == 'true' || steps.changes.outputs.proto_changes == 'true')
uses: actions/setup-go@v3
with:
go-version: 1.18.7
go-version: 1.20.13

- name: Get dependencies
if: steps.skip-workflow.outputs.skip-workflow == 'false'
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export CGO_CFLAGS := -O1
build-dyn:
ifndef NOBANNER
echo $$(date): Building source tree
go version
endif
bash ./build.env
CGO_ENABLED=0 go install -trimpath $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/...
Expand All @@ -60,6 +61,7 @@ endif
build:
ifndef NOBANNER
echo $$(date): Building source tree
go version
endif
bash ./build.env
# build all the binaries by default with CGO disabled.
Expand All @@ -71,6 +73,7 @@ endif
cross-build:
ifndef NOBANNER
echo $$(date): Building source tree
go version
endif
bash ./build.env
# In order to cross-compile, go install requires GOBIN to be unset
Expand All @@ -85,6 +88,7 @@ endif
debug:
ifndef NOBANNER
echo $$(date): Building source tree
go version
endif
bash ./build.env
go install -trimpath $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" -gcflags -'N -l' ./go/...
Expand Down Expand Up @@ -243,7 +247,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
# This rule builds the bootstrap images for all flavors.
DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80
DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
BOOTSTRAP_VERSION=10.2
BOOTSTRAP_VERSION=14.12
ensure_bootstrap_version:
find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go
Expand Down
2 changes: 1 addition & 1 deletion test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ For example:
// Flags
var (
flavor = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
bootstrapVersion = flag.String("bootstrap-version", "10.2", "the version identifier to use for the docker images")
bootstrapVersion = flag.String("bootstrap-version", "14.12", "the version identifier to use for the docker images")
runCount = flag.Int("runs", 1, "run each test this many times")
retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
logPass = flag.Bool("log-pass", false, "log test output even if it passes")
Expand Down
Loading