Skip to content

Conversation

@marcleblanc2
Copy link
Contributor

@marcleblanc2 marcleblanc2 commented May 15, 2025

Adding the new INDEXED_SEARCH_INDEXER env var

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

Tested on test instance

@marcleblanc2 marcleblanc2 requested review from a team, loujar and stefanhengl May 15, 2025 23:12
@marcleblanc2 marcleblanc2 marked this pull request as ready for review May 15, 2025 23:12
@marcleblanc2 marcleblanc2 enabled auto-merge (squash) May 15, 2025 23:12
@marcleblanc2 marcleblanc2 merged commit ba714c5 into main May 15, 2025
12 of 13 checks passed
@marcleblanc2 marcleblanc2 deleted the marc/INDEXED_SEARCH_INDEXER branch May 15, 2025 23:20
@sourcegraph-release-bot
Copy link
Collaborator

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

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.2.x -p 1208
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.2.x 6.2.x
# Navigate to the new working tree
cd .worktrees/backport-6.2.x
# Create a new branch
git switch --create backport-1208-to-6.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ba714c58a6e06742919f3077daa3bf114ef97c17
# Push it to GitHub
git push --set-upstream origin backport-1208-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.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-1208-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.2.x and the compare/head branch is backport-1208-to-6.2.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.

@sourcegraph-release-bot
Copy link
Collaborator

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

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.3.x -p 1208
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.3.x 6.3.x
# Navigate to the new working tree
cd .worktrees/backport-6.3.x
# Create a new branch
git switch --create backport-1208-to-6.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ba714c58a6e06742919f3077daa3bf114ef97c17
# Push it to GitHub
git push --set-upstream origin backport-1208-to-6.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.3.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-1208-to-6.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.3.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.3.x and the compare/head branch is backport-1208-to-6.3.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.

marcleblanc2 pushed a commit that referenced this pull request May 16, 2025
…nvs (#1209)

Add `INDEXED_SEARCH_INDEXER` to sourcegraph-frontend-internal service
ENVs. Follow up to
#1208

### Checklist

<!--
Kubernetes and Docker Compose MUST be kept in sync. You should not merge
a change here
without a corresponding change in the other repository, unless it truly
is specific to
this repository. If uneeded, add link or explanation of why it is not
needed here.
-->
* [ ] Sister
[deploy-sourcegraph](https://github.com/sourcegraph/deploy-sourcegraph)
change:
* [ ] Sister
[customer-replica](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1)
change (if necessary, for any changes affecting pure-docker or
configuration):
* [ ] All images have a valid tag and SHA256 sum
### Test plan

CI
<!--
As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests
are REQUIRED to
provide a "test plan". A test plan is a loose explanation of what you
have done or
implemented to test this, as outlined in our Testing principles and
guidelines:

https://docs.sourcegraph.com/dev/background-information/testing_principles
  Write your test plan here after the "Test plan" header.
-->
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