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

fix: use the right Go version in the CI (backport #346) #533

Closed
wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2021

This is an automatic backport of pull request #346 done by Mergify.
Cherry-pick of 40e6fb3 has failed:

On branch mergify/bp/7.14/pr-346
Your branch is up to date with 'origin/7.14'.

You are currently cherry-picking commit 40e6fb3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/Jenkinsfile

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f888d11 has failed:

On branch mergify/bp/7.14/pr-346
Your branch is ahead of 'origin/7.14' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f888d11.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

Cherry-pick of 078b9bc has failed:

On branch mergify/bp/7.14/pr-346
Your branch is ahead of 'origin/7.14' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 078b9bc.
  (all conflicts fixed: 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)

nothing to commit, working tree clean

Cherry-pick of 0871589 has failed:

On branch mergify/bp/7.14/pr-346
Your branch is ahead of 'origin/7.14' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0871589.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/Jenkinsfile

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 21328bf has failed:

On branch mergify/bp/7.14/pr-346
Your branch is ahead of 'origin/7.14' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 21328bf.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/Jenkinsfile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit 40e6fb3)

# Conflicts:
#	.ci/Jenkinsfile
(cherry picked from commit f888d11)
This reverts commit 40e6fb3.

(cherry picked from commit 0871589)

# Conflicts:
#	.ci/Jenkinsfile
If we call it within the BASE_DIR, it will automatically infer the .go-version
reading it from the root dir

(cherry picked from commit 21328bf)

# Conflicts:
#	.ci/Jenkinsfile
@mergify mergify bot requested a review from a team as a code owner July 8, 2021 14:10
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 8, 2021
@mergify mergify bot mentioned this pull request Jul 8, 2021
6 tasks
@v1v v1v closed this Jul 8, 2021
@mergify mergify bot deleted the mergify/bp/7.14/pr-346 branch July 8, 2021 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants