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: Bumping go to 1.21.6 #80709

Merged
merged 6 commits into from Jan 23, 2024
Merged

Chore: Bumping go to 1.21.6 #80709

merged 6 commits into from Jan 23, 2024

Conversation

tolzhabayev
Copy link
Contributor

@tolzhabayev tolzhabayev commented Jan 17, 2024

What is this feature?

Bumping go to 1.21.6 and unpinning the alpine version used as it seems like the bug was resolved in sqlite 1.14.19 mattn/go-sqlite3#1177 (comment)

Why do we need this feature?

Maintenance

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@tolzhabayev tolzhabayev changed the title Bumping go to 1.21.6 Chore: Bumping go to 1.21.6 Jan 17, 2024
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.4.x milestone Jan 17, 2024
@grafana-pr-automation grafana-pr-automation bot added type/build-packaging type/ci Tasks related to Continuous Integration workflow labels Jan 17, 2024
@tolzhabayev tolzhabayev self-assigned this Jan 17, 2024
@tolzhabayev tolzhabayev added type/chore dependencies Pull requests that update a dependency file go Pull requests that update Go code and removed area/backend labels Jan 17, 2024
@tolzhabayev tolzhabayev marked this pull request as ready for review January 17, 2024 10:55
@tolzhabayev tolzhabayev requested review from a team and DanCech as code owners January 17, 2024 10:55
@tolzhabayev tolzhabayev added the no-backport Skip backport of PR label Jan 17, 2024
Ukochka pushed a commit that referenced this pull request Feb 14, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version
@aangelisc aangelisc added backport v9.5.x Bot will automatically open backport PR backport v10.0.x backport v10.1.x backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x and removed no-backport Skip backport of PR labels Feb 29, 2024
Copy link
Contributor

The backport to v10.0.x 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-80709-to-v10.0.x origin/v10.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4083d23f017d5118f80d478d16d52fb65a48b462

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.0.x
# Create the PR body template
PR_BODY=$(gh pr view 80709 --json body --template 'Backport 4083d23f017d5118f80d478d16d52fb65a48b462 from #80709{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.0.x] Chore: Bumping go to 1.21.6" --body-file - --label "type/chore" --label "type/build-packaging" --label "area/backend" --label "dependencies" --label "go" --label "type/ci" --label "no-changelog" --label "backport" --base v10.0.x --milestone 10.0.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.0.x

# Create a pull request where the `base` branch is `v10.0.x` and the `compare`/`head` branch is `backport-80709-to-v10.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-80709-to-v10.0.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Feb 29, 2024
Copy link
Contributor

The backport to v9.5.x 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-80709-to-v9.5.x origin/v9.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4083d23f017d5118f80d478d16d52fb65a48b462

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v9.5.x
# Create the PR body template
PR_BODY=$(gh pr view 80709 --json body --template 'Backport 4083d23f017d5118f80d478d16d52fb65a48b462 from #80709{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.5.x] Chore: Bumping go to 1.21.6" --body-file - --label "type/chore" --label "type/build-packaging" --label "area/backend" --label "dependencies" --label "go" --label "type/ci" --label "no-changelog" --label "backport" --base v9.5.x --milestone 9.5.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v9.5.x

# Create a pull request where the `base` branch is `v9.5.x` and the `compare`/`head` branch is `backport-80709-to-v9.5.x`.

# Remove the local backport branch
git switch main
git branch -D backport-80709-to-v9.5.x

Copy link
Contributor

The backport to v10.1.x 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-80709-to-v10.1.x origin/v10.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4083d23f017d5118f80d478d16d52fb65a48b462

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.1.x
# Create the PR body template
PR_BODY=$(gh pr view 80709 --json body --template 'Backport 4083d23f017d5118f80d478d16d52fb65a48b462 from #80709{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.1.x] Chore: Bumping go to 1.21.6" --body-file - --label "type/chore" --label "type/build-packaging" --label "area/backend" --label "dependencies" --label "go" --label "type/ci" --label "no-changelog" --label "backport" --base v10.1.x --milestone 10.1.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.1.x

# Create a pull request where the `base` branch is `v10.1.x` and the `compare`/`head` branch is `backport-80709-to-v10.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-80709-to-v10.1.x

Copy link
Contributor

The backport to v10.3.x 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-80709-to-v10.3.x origin/v10.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4083d23f017d5118f80d478d16d52fb65a48b462

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.3.x
# Create the PR body template
PR_BODY=$(gh pr view 80709 --json body --template 'Backport 4083d23f017d5118f80d478d16d52fb65a48b462 from #80709{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.3.x] Chore: Bumping go to 1.21.6" --body-file - --label "type/chore" --label "type/build-packaging" --label "area/backend" --label "dependencies" --label "go" --label "type/ci" --label "no-changelog" --label "backport" --base v10.3.x --milestone 10.3.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.3.x

# Create a pull request where the `base` branch is `v10.3.x` and the `compare`/`head` branch is `backport-80709-to-v10.3.x`.

# Remove the local backport branch
git switch main
git branch -D backport-80709-to-v10.3.x

Copy link
Contributor

The backport to v10.2.x 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-80709-to-v10.2.x origin/v10.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 4083d23f017d5118f80d478d16d52fb65a48b462

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 80709 --json body --template 'Backport 4083d23f017d5118f80d478d16d52fb65a48b462 from #80709{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] Chore: Bumping go to 1.21.6" --body-file - --label "type/chore" --label "type/build-packaging" --label "area/backend" --label "dependencies" --label "go" --label "type/ci" --label "no-changelog" --label "backport" --base v10.2.x --milestone 10.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-80709-to-v10.2.x

# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-80709-to-v10.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-80709-to-v10.2.x

aangelisc pushed a commit that referenced this pull request Feb 29, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	.github/workflows/alerting-swagger-gen.yml
#	.github/workflows/publish-kinds-next.yml
#	.github/workflows/publish-kinds-release.yml
#	.github/workflows/verify-kinds.yml
#	go.mod
#	go.sum
#	scripts/drone/variables.star
aangelisc pushed a commit that referenced this pull request Feb 29, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	.github/workflows/alerting-swagger-gen.yml
#	.github/workflows/publish-kinds-next.yml
#	.github/workflows/publish-kinds-release.yml
#	.github/workflows/verify-kinds.yml
#	go.mod
#	go.sum
#	scripts/drone/variables.star
aangelisc pushed a commit that referenced this pull request Feb 29, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star
aangelisc pushed a commit that referenced this pull request Feb 29, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star
aangelisc pushed a commit that referenced this pull request Feb 29, 2024
* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star
aangelisc added a commit that referenced this pull request Mar 1, 2024
Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	.github/workflows/alerting-swagger-gen.yml
#	.github/workflows/publish-kinds-next.yml
#	.github/workflows/publish-kinds-release.yml
#	.github/workflows/verify-kinds.yml
#	go.mod
#	go.sum
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
aangelisc added a commit that referenced this pull request Mar 1, 2024
Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
aangelisc added a commit that referenced this pull request Mar 1, 2024
Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
aangelisc added a commit that referenced this pull request Mar 1, 2024
Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
aangelisc added a commit that referenced this pull request Mar 1, 2024
Chore: Bumping go to 1.21.6 (#80709)

* Bumping go to 1.25.6

* bumping sqlite to 1.14.19

* Bumping sqlite version

(cherry picked from commit 4083d23)

# Conflicts:
#	.drone.yml
#	.github/workflows/alerting-swagger-gen.yml
#	.github/workflows/publish-kinds-next.yml
#	.github/workflows/publish-kinds-release.yml
#	.github/workflows/verify-kinds.yml
#	go.mod
#	go.sum
#	scripts/drone/variables.star

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/backend backport v9.5.x Bot will automatically open backport PR backport v10.0.x backport v10.1.x backport v10.2.x backport v10.3.x Mark PR for automatic backport to v10.3.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. dependencies Pull requests that update a dependency file go Pull requests that update Go code no-changelog Skip including change in changelog/release notes type/build-packaging type/chore type/ci Tasks related to Continuous Integration workflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants