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.

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

chore: merge upstream #33

Merged
merged 18 commits into from
Jan 2, 2024
Merged

chore: merge upstream #33

merged 18 commits into from
Jan 2, 2024

Conversation

RainbowDashy
Copy link
Collaborator

No description provided.

rashiq and others added 15 commits January 2, 2024 11:14
* pin stretch image

* update stretch repo

* Update Dockerfile.test
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>
* WIP

* Pass entire sql.UniqueKey

* newline for limit

* Rename var

---------

Co-authored-by: meiji163 <meiji163@github.com>
* 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>
* 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

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>
* 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>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@d-bytebase d-bytebase merged commit 69d72ba into main Jan 2, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants