Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

zoekt: update to 3ce1f2b24c80b3dea89d237600d2b0879342ed1b #56525

Merged
merged 4 commits into from
Sep 12, 2023

Conversation

ggilmore
Copy link
Contributor

@ggilmore ggilmore commented Sep 12, 2023

This bumps Zoekt to sourcegraph/zoekt@3ce1f2b

See the screenshot below for what the new graphs look like:

image

Test plan

CI

Preview 🤩

Preview Link

@cla-bot cla-bot bot added the cla-signed label Sep 12, 2023
@ggilmore ggilmore marked this pull request as ready for review September 12, 2023 01:27
@ggilmore ggilmore marked this pull request as draft September 12, 2023 01:27
@sourcegraph-bot
Copy link
Contributor

sourcegraph-bot commented Sep 12, 2023

Codenotify: Notifying subscribers in CODENOTIFY files for diff e796b94...29d7ce3.

Notify File(s)
@bobheadxi monitoring/definitions/frontend.go
monitoring/definitions/git_server.go
monitoring/definitions/repo_updater.go
monitoring/definitions/searcher.go
monitoring/definitions/shared/grpc.go
monitoring/definitions/symbols.go
monitoring/definitions/zoekt.go
@camdencheek internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/zoekt.go
@jtibshirani internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/zoekt.go
@keegancsmith internal/search/backend/BUILD.bazel
internal/search/backend/grpc.go
internal/search/backend/zoekt.go
@slimsag monitoring/definitions/frontend.go
monitoring/definitions/git_server.go
monitoring/definitions/repo_updater.go
monitoring/definitions/searcher.go
monitoring/definitions/shared/grpc.go
monitoring/definitions/symbols.go
monitoring/definitions/zoekt.go
@sourcegraph/delivery doc/admin/observability/dashboards.md
monitoring/definitions/frontend.go
monitoring/definitions/git_server.go
monitoring/definitions/repo_updater.go
monitoring/definitions/searcher.go
monitoring/definitions/shared/grpc.go
monitoring/definitions/symbols.go
monitoring/definitions/zoekt.go

@ggilmore ggilmore changed the title bump zoekt to version in sourcegraph/zoekt#642 zoekt: update to 3ce1f2b24c80b3dea89d237600d2b0879342ed1b Sep 12, 2023
@ggilmore ggilmore marked this pull request as ready for review September 12, 2023 16:04
@ggilmore ggilmore requested a review from a team September 12, 2023 16:07
@ggilmore ggilmore enabled auto-merge (squash) September 12, 2023 16:07
@ggilmore ggilmore merged commit b32587f into main Sep 12, 2023
14 checks passed
@ggilmore ggilmore deleted the update-zoekt-prometheus-grpc-metrics branch September 12, 2023 16:10
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 5.1 failed at https://github.com/sourcegraph/sourcegraph/actions/runs/6162071773:

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 working tree
git worktree add .worktrees/backport-5.1 5.1
# Navigate to the new working tree
cd .worktrees/backport-5.1
# Create a new branch
git switch --create backport-56525-to-5.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b32587f4f044e6e1d58543216387941381294e03
# Push it to GitHub
git push --set-upstream origin backport-56525-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1

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-56525-to-5.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.1
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.1 and the compare/head branch is backport-56525-to-5.1., click here to create the pull request.
  • Make sure to tag @sourcegraph/release-guild in the pull request description.
  • Once the backport pull request is created, kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot sourcegraph-release-bot added backports failed-backport-to-5.1 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Sep 12, 2023
ggilmore added a commit that referenced this pull request Sep 12, 2023
(cherry picked from commit b32587f)

 Conflicts:
	internal/search/backend/zoekt.go
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backports cla-signed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants