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

Remove old feature gates from pre-4.0 #822

Merged
merged 6 commits into from
Aug 25, 2022
Merged

Conversation

eseliger
Copy link
Member

@eseliger eseliger commented Aug 16, 2022

Requires a newer Sourcegraph version from sourcegraph/sourcegraph#40446.

This also adds a feature gate for sourcegraph 4.0 to src-cli to warn users when they use a too recent version of src-cli.

Closes sourcegraph/sourcegraph#38969
Closes sourcegraph/sourcegraph#38967

Test plan

Test suite and verified manually the 4.0 banner and previous functionality work.

@eseliger eseliger force-pushed the es/cleanup-feature-gates branch 2 times, most recently from 685b513 to fc3fa34 Compare August 16, 2022 22:19
Base automatically changed from es/no-local-workspace-resolver to main August 24, 2022 13:56
@eseliger eseliger marked this pull request as ready for review August 24, 2022 14:47
@eseliger eseliger requested review from mrnugget and a team August 24, 2022 14:47
Copy link
Contributor

@Piszmog Piszmog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

I'm mentally preparing myself for the merge conflict I'm going to have to go thru.

Copy link
Contributor

@LawnGnome LawnGnome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's beautiful.

cmd/src/batch_common.go Outdated Show resolved Hide resolved
@@ -604,3 +583,14 @@ func getBatchParallelism(ctx context.Context, flag int) (int, error) {

return docker.NCPU(ctx)
}

func validateSourcegraphVersionConstraint(ctx context.Context, svc *service.Service) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I worry a little that this may be too simplistic as we start adding things in 4.x again, but let's cross that bridge when we get to it.

internal/api/api.go Outdated Show resolved Hide resolved
eseliger and others added 2 commits August 25, 2022 20:34
Co-authored-by: Adam Harvey <adam@adamharvey.name>
@eseliger eseliger merged commit a415fac into main Aug 25, 2022
@eseliger eseliger deleted the es/cleanup-feature-gates branch August 25, 2022 18:38
Copy link
Contributor

@courier-new courier-new left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DELETE 👏 IT 👏 ALL 👏

scjohns pushed a commit that referenced this pull request Apr 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Removing all "campaigns" aliases and shim Remove old feature gates from src-cli
4 participants