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

update to go1.18 (backport #1177) #1194

Merged
merged 8 commits into from
Apr 7, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2022

This is an automatic backport of pull request #1177 done by Mergify.
Cherry-pick of eed3294 has failed:

On branch mergify/bp/v7.x/pr-1177
Your branch is up to date with 'origin/v7.x'.

You are currently cherry-picking commit eed3294.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build.yml
	modified:   .github/workflows/sim.yml
	modified:   CHANGELOG.md
	modified:   Dockerfile
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/test.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* update to go1.18

* Update CHANGELOG.md

(cherry picked from commit eed3294)

# Conflicts:
#	.github/workflows/test.yml
@mergify mergify bot added the conflicts label Apr 5, 2022
@ValarDragon
Copy link
Member

RIP the linter changed across the upgrade, so a bunch of lints to fix

@codecov-commenter
Copy link

Codecov Report

Merging #1194 (3021521) into v7.x (18d70da) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v7.x    #1194   +/-   ##
=======================================
  Coverage   20.86%   20.86%           
=======================================
  Files         199      199           
  Lines       25416    25416           
=======================================
  Hits         5303     5303           
  Misses      19150    19150           
  Partials      963      963           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 18d70da...3021521. Read the comment docs.

CHANGELOG.md Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@alexanderbez
Copy link
Contributor

Yikes, there's a handful of linting errors. I presume linters were tweaked on main and not backported. Does this sound right @ValarDragon? Do you know what PR this was so we can maybe backport it?

@ValarDragon ValarDragon self-assigned this Apr 7, 2022
@ValarDragon
Copy link
Member

It was version incompatibility issues between the golangci-lint version and go1.18, updating the golangci-lint to match the version in main fixes this!

@ValarDragon ValarDragon merged commit 17c5b4b into v7.x Apr 7, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v7.x/pr-1177 branch April 7, 2022 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants