diff --git a/client/browser/scripts/tasks.ts b/client/browser/scripts/tasks.ts index dd271feab17..8be71721733 100644 --- a/client/browser/scripts/tasks.ts +++ b/client/browser/scripts/tasks.ts @@ -227,7 +227,14 @@ const buildForBrowser = curry((browser: Browser, environment: BuildEnvironment): writeSchema(buildDirectory) copyExtensionAssets(buildDirectory) - copyInlineExtensions(buildDirectory) + + // TODO(@camdencheek): figure out whether we actually want to continue + // shipping the inline extensions with the browser extensions. For now, + // skip them for the firefox extension because they are being detected + // as non-human-readable assets, and will cause removal from the addon store. + if (browser !== 'firefox') { + copyInlineExtensions(buildDirectory) + } // Create a bundle by zipping the web extension directory. const browserBundleZip = BROWSER_BUNDLE_ZIPS[browser] diff --git a/client/browser/src/integration/__fixtures__/git_hub_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz b/client/browser/src/integration/__fixtures__/git_hub_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz index 50702450f56..d9d640a4798 100644 Binary files a/client/browser/src/integration/__fixtures__/git_hub_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz and b/client/browser/src/integration/__fixtures__/git_hub_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz differ diff --git a/client/browser/src/integration/__fixtures__/git_lab_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz b/client/browser/src/integration/__fixtures__/git_lab_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz index d752aabc6f9..1003b502f26 100644 Binary files a/client/browser/src/integration/__fixtures__/git_lab_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz and b/client/browser/src/integration/__fixtures__/git_lab_adds_view_on_sourcegraph_buttons_to_files/-SG_POLLY-adds_view_on_sourcegraph_buttons_to_files_3427147428/recording.har.gz differ diff --git a/client/browser/src/integration/__fixtures__/git_lab_shows_hover_tooltips_when_hovering_a_token/-SG_POLLY-shows_hover_tooltips_when_hovering_a_token_2664440384/recording.har.gz b/client/browser/src/integration/__fixtures__/git_lab_shows_hover_tooltips_when_hovering_a_token/-SG_POLLY-shows_hover_tooltips_when_hovering_a_token_2664440384/recording.har.gz index 12f78fc75d2..444e031ca74 100644 Binary files a/client/browser/src/integration/__fixtures__/git_lab_shows_hover_tooltips_when_hovering_a_token/-SG_POLLY-shows_hover_tooltips_when_hovering_a_token_2664440384/recording.har.gz and b/client/browser/src/integration/__fixtures__/git_lab_shows_hover_tooltips_when_hovering_a_token/-SG_POLLY-shows_hover_tooltips_when_hovering_a_token_2664440384/recording.har.gz differ diff --git a/client/browser/src/integration/gitlab.test.ts b/client/browser/src/integration/gitlab.test.ts index 0baac77c22c..832a2067616 100644 --- a/client/browser/src/integration/gitlab.test.ts +++ b/client/browser/src/integration/gitlab.test.ts @@ -55,7 +55,7 @@ describe('GitLab', () => { }), ResolveRepoName: () => ({ repository: { - name: 'gitlab.com/sourcegraph/jsonrpc2', + name: 'gitlab.com/SourcegraphCody/jsonrpc2', }, }), ResolveRev: () => ({ @@ -115,9 +115,10 @@ describe('GitLab', () => { } } - const repoName = 'gitlab.com/sourcegraph/jsonrpc2' + const repoName = 'gitlab.com/SourcegraphCody/jsonrpc2' - const url = 'https://gitlab.com/sourcegraph/jsonrpc2/blob/4fb7cd90793ee6ab445f466b900e6bffb9b63d78/call_opt.go' + const url = + 'https://gitlab.com/SourcegraphCody/jsonrpc2/blob/4fb7cd90793ee6ab445f466b900e6bffb9b63d78/call_opt.go' await driver.page.goto(url) await driver.page.waitForSelector('[data-testid="code-view-toolbar"] [data-testid="open-on-sourcegraph"]', { @@ -179,7 +180,7 @@ describe('GitLab', () => { }) await driver.page.goto( - 'https://gitlab.com/sourcegraph/jsonrpc2/blob/4fb7cd90793ee6ab445f466b900e6bffb9b63d78/call_opt.go' + 'https://gitlab.com/SourcegraphCody/jsonrpc2/blob/4fb7cd90793ee6ab445f466b900e6bffb9b63d78/call_opt.go' ) await driver.page.waitForSelector('[data-testid="code-view-toolbar"] [data-testid="open-on-sourcegraph"]') diff --git a/client/browser/src/shared/code-hosts/gitlab/codeHost.test.ts b/client/browser/src/shared/code-hosts/gitlab/codeHost.test.ts index 82861b0ff38..2c043334335 100644 --- a/client/browser/src/shared/code-hosts/gitlab/codeHost.test.ts +++ b/client/browser/src/shared/code-hosts/gitlab/codeHost.test.ts @@ -23,7 +23,7 @@ describe('gitlab/codeHost', () => { beforeAll(async () => { document.documentElement.innerHTML = await readFile(__dirname + '/__fixtures__/merge-request.html', 'utf-8') - jsdom.reconfigure({ url: 'https://gitlab.com/sourcegraph/jsonrpc2/merge_requests/1/diffs' }) + jsdom.reconfigure({ url: 'https://gitlab.com/SourcegraphCody/jsonrpc2/merge_requests/1/diffs' }) globalThis.gon = { gitlab_url: 'https://gitlab.com' } }) @@ -107,7 +107,7 @@ describe('gitlab/codeHost', () => { ) }) it('returns an URL to the file on the same merge request if possible', () => { - const rawRepoName = 'gitlab.com/sourcegraph/jsonrpc2' + const rawRepoName = 'gitlab.com/SourcegraphCody/jsonrpc2' // Update the resolved Sourcegraph repo name value repoNameOnSourcegraph.next(rawRepoName) @@ -127,7 +127,7 @@ describe('gitlab/codeHost', () => { { part: 'head' } ) ).toBe( - 'https://gitlab.com/sourcegraph/jsonrpc2/merge_requests/1/diffs#9e1d3828a925c1eca74b74c20b58a9138f886d29_3_5' + 'https://gitlab.com/SourcegraphCody/jsonrpc2/merge_requests/1/diffs#9e1d3828a925c1eca74b74c20b58a9138f886d29_3_5' ) }) }) diff --git a/client/browser/src/shared/code-hosts/gitlab/scrape.ts b/client/browser/src/shared/code-hosts/gitlab/scrape.ts index 86053d41f65..3c69fbaf71c 100644 --- a/client/browser/src/shared/code-hosts/gitlab/scrape.ts +++ b/client/browser/src/shared/code-hosts/gitlab/scrape.ts @@ -57,7 +57,7 @@ export const getGitlabRepoURL = (): string => { if (!projectLink) { throw new Error('Unable to determine project name') } - return projectLink.href // e.g. 'https://gitlab.com/sourcegraph/jsonrpc2' + return projectLink.href // e.g. 'https://gitlab.com/SourcegraphCody/jsonrpc2' } const parseFullProjectName = (fullProjectName: string): { owner: string; projectName: string } => { @@ -75,7 +75,7 @@ const parseGitLabRepoURL = (): { hostname: string; projectFullName: string; owne } /** - * Subject to store repo name on the Sourcegraph instance (e.g. 'gitlab.com/sourcegraph/jsonrpc2'). + * Subject to store repo name on the Sourcegraph instance (e.g. 'gitlab.com/SourcegraphCody/jsonrpc2'). * It may be different from the repo name on the code host because of the name transformations applied * (see {@link https://docs.sourcegraph.com/admin/external_service/gitlab#nameTransformations}). * Set in `gitlabCodeHost.prepareCodeHost` method. diff --git a/dev/ci/internal/ci/pipeline.go b/dev/ci/internal/ci/pipeline.go index 83f279c20c8..62d63227f2d 100644 --- a/dev/ci/internal/ci/pipeline.go +++ b/dev/ci/internal/ci/pipeline.go @@ -178,7 +178,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) { wait, addVsceReleaseSteps) - case runtype.BextNightly: + case runtype.BextNightly, runtype.BextManualNightly: // If this is a browser extension nightly build, run the browser-extension tests and // e2e tests. ops = operations.NewSet( diff --git a/dev/ci/runtype/runtype.go b/dev/ci/runtype/runtype.go index fc90dd0420e..f162b0a12dc 100644 --- a/dev/ci/runtype/runtype.go +++ b/dev/ci/runtype/runtype.go @@ -18,12 +18,13 @@ const ( // Nightly builds - must be first because they take precedence - ReleaseNightly // release branch nightly healthcheck builds - BextNightly // browser extension nightly build - VsceNightly // vs code extension nightly build - AppRelease // app release build - AppInsiders // app insiders build - WolfiBaseRebuild // wolfi base image build + ReleaseNightly // release branch nightly healthcheck builds + BextNightly // browser extension nightly build + BextManualNightly // browser extension nightly build, triggered with a branch pattern + VsceNightly // vs code extension nightly build + AppRelease // app release build + AppInsiders // app insiders build + WolfiBaseRebuild // wolfi base image build // Release branches @@ -98,6 +99,10 @@ func (t RunType) Matcher() *RunTypeMatcher { "BEXT_NIGHTLY": "true", }, } + case BextManualNightly: + return &RunTypeMatcher{ + Branch: "bext-nightly/", + } case VsceNightly: return &RunTypeMatcher{ EnvIncludes: map[string]string{ @@ -197,6 +202,8 @@ func (t RunType) String() string { return "Release branch nightly healthcheck build" case BextNightly: return "Browser extension nightly release build" + case BextManualNightly: + return "Manually triggered browser extension nightly release build" case VsceNightly: return "VS Code extension nightly release build" case WolfiBaseRebuild: diff --git a/doc/dev/background-information/sg/reference.md b/doc/dev/background-information/sg/reference.md index 748a6bca133..4c1469597c3 100644 --- a/doc/dev/background-information/sg/reference.md +++ b/doc/dev/background-information/sg/reference.md @@ -270,6 +270,7 @@ This command is useful when: Supported run types when providing an argument for 'sg ci build [runtype]': * _manually_triggered_external - Manually Triggered External Build +* bext-nightly - Manually triggered browser extension nightly release build * main-dry-run - Main dry run * docker-images-patch - Patch image * docker-images-patch-notest - Patch image without testing