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(deps): update golang docker tag to v1.21.3 (main) #6325

Merged
merged 2 commits into from
Oct 11, 2023

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Oct 10, 2023

Mend Renovate

This PR contains the following updates:

Package Type Update Change
golang final patch 1.21.2-bullseye -> 1.21.3-bullseye

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot requested a review from a team as a code owner October 10, 2023 21:38
@github-actions
Copy link
Contributor

Building new version of mimir-build-image. After image is built and pushed to Docker Hub, a new commit will automatically be added to this PR with new image version `grafana/mimir-build-image:pr6325-d6fe286995`. This can take up to 1 hour.

@github-actions
Copy link
Contributor

Not building new version of mimir-build-image. This PR modifies `mimir-build-image/Dockerfile`, but the image `grafana/mimir-build-image:pr6325-d6fe286995` already exists.

Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makefile update with grafana/mimir-build-image:pr6325-d6fe286995 is missing.

@aknuds1
Copy link
Contributor

aknuds1 commented Oct 11, 2023

That's a weird glitch @pstibrany, maybe it's because the automation got interrupted.

renovate bot and others added 2 commits October 11, 2023 09:48
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@renovate
Copy link
Contributor Author

renovate bot commented Oct 11, 2023

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

Warning: custom changes will be lost.

@github-actions
Copy link
Contributor

Not building new version of mimir-build-image. This PR modifies `mimir-build-image/Dockerfile`, but the image `grafana/mimir-build-image:pr6325-d6fe286995` already exists.

Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

@colega
Copy link
Contributor

colega commented Oct 11, 2023

This should be backported to 2.10 to release 2.10.1

@aknuds1 aknuds1 enabled auto-merge (squash) October 11, 2023 08:03
@aknuds1 aknuds1 merged commit ed62c6e into main Oct 11, 2023
31 checks passed
@aknuds1 aknuds1 deleted the deps-update/main-golang-1.x branch October 11, 2023 08:16
@grafanabot
Copy link
Contributor

The backport to release-2.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6325-to-release-2.10 origin/release-2.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ed62c6eb7ee8efceda0081713e668265505ebe6e
# Push it to GitHub
git push --set-upstream origin backport-6325-to-release-2.10
git switch main
# Remove the local backport branch
git branch -D backport-6325-to-release-2.10

Then, create a pull request where the base branch is release-2.10 and the compare/head branch is backport-6325-to-release-2.10.

aknuds1 added a commit that referenced this pull request Oct 11, 2023
* chore(deps): update golang docker tag to v1.21.3

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit ed62c6e)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@colega
Copy link
Contributor

colega commented Oct 11, 2023

I'll do the backport manually.

@aknuds1
Copy link
Contributor

aknuds1 commented Oct 11, 2023

Backport is already done @colega.

aknuds1 added a commit that referenced this pull request Oct 11, 2023
…1.3 (main) (#6325) (#6334)

* chore(deps): update golang docker tag to v1.21.3 (main) (#6325)
* Update build image version to pr6334-7c9bc193ea

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: aknuds1 <aknuds1@users.noreply.github.com>
@grafanabot
Copy link
Contributor

The backport to release-2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6325-to-release-2.9 origin/release-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ed62c6eb7ee8efceda0081713e668265505ebe6e
# Push it to GitHub
git push --set-upstream origin backport-6325-to-release-2.9
git switch main
# Remove the local backport branch
git branch -D backport-6325-to-release-2.9

Then, create a pull request where the base branch is release-2.9 and the compare/head branch is backport-6325-to-release-2.9.

lamida pushed a commit that referenced this pull request Oct 13, 2023
* chore(deps): update golang docker tag to v1.21.3

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit ed62c6e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants