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(rel): update latest tags #1151

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Conversation

jdpleiness
Copy link
Contributor

@jdpleiness jdpleiness commented Jan 29, 2025

Update docker images to latest Sourcegraph release

Checklist

  • Sister deploy-sourcegraph change:
  • Sister customer-replica change (if necessary, for any changes affecting pure-docker or configuration):
  • All images have a valid tag and SHA256 sum

Test plan

CI

Copy link
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@jdpleiness jdpleiness requested a review from a team January 29, 2025 14:27
@jdpleiness jdpleiness marked this pull request as ready for review January 29, 2025 14:27
@jdpleiness jdpleiness merged commit b130909 into main Jan 30, 2025
9 checks passed
Copy link
Contributor Author

Merge activity

  • Jan 30, 2:20 PM EST: A user merged this pull request with Graphite.

@jdpleiness jdpleiness deleted the 01-29-chore_rel_update_latest_tags branch January 30, 2025 19:20
@Chickensoupwithrice
Copy link
Contributor

We never backported this to the 6.0 branch?

@Chickensoupwithrice Chickensoupwithrice restored the 01-29-chore_rel_update_latest_tags branch January 31, 2025 22:46
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 6.0.x failed at https://github.com/sourcegraph/deploy-sourcegraph-docker/actions/runs/13082046713:

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

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 6.0.x -p 1151
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-6.0.x 6.0.x
# Navigate to the new working tree
cd .worktrees/backport-6.0.x
# Create a new branch
git switch --create backport-1151-to-6.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b13090976591bba0362c8281bed1aea7313c5c44
# Push it to GitHub
git push --set-upstream origin backport-1151-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1151-to-6.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.0.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.0.x and the compare/head branch is backport-1151-to-6.0.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

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.

4 participants