Update to `go1.21` #1351

timvaillancourt · 2023-12-09T00:41:16Z

Description

This PR updates the builds from go1.17->go1.21 (current stable). Also:

the golang docker images are based on bullseye instead of stretch
the golangci-lint version was updated to v1.54.2 to support go1.21
- Some files were updated to remove new linter complaints for deprecated io/ioutil
ran go mod tidy and go mod vendor

Finally, GitHub Actions were updated to ubuntu-latest, except the replica tests which had problems with MySQL 5.7 and linked libraries - I'm working on a new PR to fix this

In case this PR introduced Go code changes:

contributed code is using same conventions as original code
script/cibuild returns with no formatting errors, build errors or unit test errors.

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt · 2023-12-09T01:07:10Z

.github/workflows/ci.yml

      with:
-        go-version: 1.17
+        go-version-file: go.mod


This lets the action use go.mod to find a version. Less things to update 🚀

timvaillancourt · 2023-12-09T01:07:56Z

script/ensure-go-installed

-PREFERRED_GO_VERSION=go1.17.11
-SUPPORTED_GO_VERSIONS='go1.1[567]'
+PREFERRED_GO_VERSION=go1.21.5
+SUPPORTED_GO_VERSIONS='go1.[1-2][1789]'


This sucks. But it will allow go1.21 and go1.17-.19 to pass through

timvaillancourt · 2023-12-09T01:10:18Z

script/ensure-go-installed

-PREFERRED_GO_VERSION=go1.17.11
-SUPPORTED_GO_VERSIONS='go1.1[567]'
+PREFERRED_GO_VERSION=go1.21.5
+SUPPORTED_GO_VERSIONS='go1.[1-2][01789]'


This is horrible, but it will allow go1.20-.21 and go1.17-.19 to passthrough

Soon we should only allow go1.2[0-2]

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt · 2023-12-09T02:15:09Z

Dockerfile.packaging


 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
-RUN gem install --no-ri --no-rdoc fpm
+RUN gem install fpm


--no-ri and --no-rdoc flags don't exist on bullseye's gem 🤷

meiji163 · 2023-12-11T22:16:55Z

Because of GitHub's "hack" to upload gh-ost binaries internally, we have to change "stretch" to "bullseye" in this line

gh-ost/script/build-deploy-tarball

Line 34 in 679d39e

focal_tarball_name=$(echo $(basename "${tarball}") | sed s/-stretch-/-focal-/)

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

timvaillancourt · 2023-12-11T22:54:37Z

Because of GitHub's "hack" to upload gh-ost binaries internally, we have to change "stretch" to "bullseye" in this line

gh-ost/script/build-deploy-tarball

Line 34 in 679d39e

focal_tarball_name=$(echo $(basename "${tarball}") | sed s/-stretch-/-focal-/)

@meiji163 makes sense. Updated 👍

* go1.21 + bullseye Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * go1.21 + bullseye pt 2 Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * checkout before setup-go Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * go fmt Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Use golangci-lint 1.54.2 to support go1.21 Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * stop using io/ioutil to make linter happy Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix typo Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Lint Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * revert replica-tests CI to ubuntu 20 due to linker errors Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Update ensure-go-installed * use `ubuntu-latest` for `ci` job Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * stretch -> bullseye Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> --------- Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

* Add `focal` build * upgrade codeQL action to v2 * Pin docker image to stretch (github#1324) * pin stretch image * update stretch repo * Update Dockerfile.test * parse binlog timestamp in UTC (github#1322) * upgrade standard library deps (github#1332) * fix: typo (github#1331) Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> * Remove stale RELEASE_VERSION file (github#1349) Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Force index in unique key range queries (github#1237) * WIP * Pass entire sql.UniqueKey * newline for limit * Rename var --------- Co-authored-by: meiji163 <meiji163@github.com> * Include git commit in version (github#1347) * Include git commit in version Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Make --version output change less-breaking --------- Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Fix tokens in inspector logging (github#1226) * Cleanup whitespace and comments in SQL query text (github#1246) * Cleanup whitespace in SQL query text * cleanup * Add indent * Update unit tests * Update unit tests, pt 2 * Fix tweaks * Fix merge conflict resolution Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> --------- Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix `--version` output (github#1352) * Fix `--version` output Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Always fallback version/commit if undef Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> --------- Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Update to `go1.21` (github#1351) * go1.21 + bullseye Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * go1.21 + bullseye pt 2 Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * checkout before setup-go Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * go fmt Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Use golangci-lint 1.54.2 to support go1.21 Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * stop using io/ioutil to make linter happy Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix typo Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Lint Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * revert replica-tests CI to ubuntu 20 due to linker errors Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Update ensure-go-installed * use `ubuntu-latest` for `ci` job Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * stretch -> bullseye Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> --------- Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> * Replace deprecated `github.com/satori/go.uuid` lib (github#1354) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Add `CODEOWNERS` file to auto-request reviews (github#1350) Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * go mod tidy * update test * fix lint --------- Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com> Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: Rashiq <rashiq@users.noreply.github.com> Co-authored-by: meiji163 <meiji163@github.com> Co-authored-by: guangwu <guoguangwu@magic-shield.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt added 4 commits December 9, 2023 01:29

go1.21 + bullseye

2f422d1

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

go1.21 + bullseye pt 2

5b67a1a

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

checkout before setup-go

b713b2e

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

go fmt

e2d4930

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt added build needs-testing labels Dec 9, 2023

timvaillancourt added this to the v1.1.7 milestone Dec 9, 2023

timvaillancourt added 5 commits December 9, 2023 01:54

Use golangci-lint 1.54.2 to support go1.21

ca4feaf

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

stop using io/ioutil to make linter happy

86c8670

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Fix typo

af48e0f

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Lint

c04407d

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

revert replica-tests CI to ubuntu 20 due to linker errors

7632fd8

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt marked this pull request as ready for review December 9, 2023 01:06

timvaillancourt requested review from meiji163, dm-2 and rashiq December 9, 2023 01:06

timvaillancourt commented Dec 9, 2023

View reviewed changes

Update ensure-go-installed

c529eca

timvaillancourt commented Dec 9, 2023

View reviewed changes

use ubuntu-latest for ci job

5bd8bb7

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

timvaillancourt commented Dec 9, 2023

View reviewed changes

timvaillancourt changed the title ~~Update to go go1.21~~ Update to go1.21 Dec 9, 2023

timvaillancourt and others added 2 commits December 11, 2023 23:53

stretch -> bullseye

c330952

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

Merge branch 'master' into go1.21

07416ea

meiji163 approved these changes Dec 11, 2023

View reviewed changes

timvaillancourt merged commit 462930f into github:master Dec 11, 2023
7 checks passed

timvaillancourt deleted the go1.21 branch December 11, 2023 23:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to `go1.21` #1351

Update to `go1.21` #1351

timvaillancourt commented Dec 9, 2023 •

edited

Loading

timvaillancourt Dec 9, 2023

timvaillancourt Dec 9, 2023

timvaillancourt Dec 9, 2023 •

edited

Loading

timvaillancourt Dec 9, 2023

meiji163 commented Dec 11, 2023

timvaillancourt commented Dec 11, 2023

Update to go1.21 #1351

Update to go1.21 #1351

Conversation

timvaillancourt commented Dec 9, 2023 • edited Loading

Description

timvaillancourt Dec 9, 2023

Choose a reason for hiding this comment

timvaillancourt Dec 9, 2023

Choose a reason for hiding this comment

timvaillancourt Dec 9, 2023 • edited Loading

Choose a reason for hiding this comment

timvaillancourt Dec 9, 2023

Choose a reason for hiding this comment

meiji163 commented Dec 11, 2023

timvaillancourt commented Dec 11, 2023

Update to `go1.21` #1351

Update to `go1.21` #1351

timvaillancourt commented Dec 9, 2023 •

edited

Loading

timvaillancourt Dec 9, 2023 •

edited

Loading