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

feat: Add experimental feature to control commit graph updates#63870

Merged
varungandhi-src merged 3 commits into
mainfrom
vg/visibility-hack
Jul 17, 2024
Merged

feat: Add experimental feature to control commit graph updates#63870
varungandhi-src merged 3 commits into
mainfrom
vg/visibility-hack

Conversation

@varungandhi-src

Copy link
Copy Markdown
Contributor

Verified locally

Test plan

Updated tests, other tests later

Changelog

@cla-bot cla-bot Bot added the cla-signed label Jul 17, 2024
@github-actions github-actions Bot added team/graph Graph Team (previously Code Intel/Language Tools/Language Platform) team/product-platform labels Jul 17, 2024
@varungandhi-src varungandhi-src merged commit 8597286 into main Jul 17, 2024
@varungandhi-src varungandhi-src deleted the vg/visibility-hack branch July 17, 2024 08:51
@sourcegraph-release-bot

sourcegraph-release-bot commented Jul 17, 2024

Copy link
Copy Markdown
Collaborator

The backport to 5.5.x failed at https://github.com/sourcegraph/sourcegraph/actions/runs/9977496009:

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 5.5.x -p 63870
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-5.5.x 5.5.x
# Navigate to the new working tree
cd .worktrees/backport-5.5.x
# Create a new branch
git switch --create backport-63870-to-5.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8597286c8ffa1a6adfe62043e36715a650f2ff2f
# Push it to GitHub
git push --set-upstream origin backport-63870-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.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-63870-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.5.x and the compare/head branch is backport-63870-to-5.5.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 sourcegraph-release-bot added backports failed-backport-to-5.5.x release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Jul 17, 2024
varungandhi-src added a commit that referenced this pull request Jul 17, 2024
@varungandhi-src varungandhi-src removed the release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases label Jul 17, 2024
mmanela referenced this pull request Jul 17, 2024
See  https://github.com/sourcegraph/sourcegraph/pull/63870

cc @sourcegraph/release

## Test plan

Covered by existing tests

## Changelog

- Adds an experimental feature `commitGraphUpdates` to control how
upload visibility is calculated.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants