This repository has been archived by the owner on Sep 30, 2024. It is now read-only.
Tags: sourcegraph/sourcegraph-public-snapshot
Tags
[Backport 5.6.x] Fix Cody Web CSS (#64373) closes: https://linear.app/sourcegraph/issue/SRCH-866/improve-cody-web-theming-for-consistency-with-rest-of-product This PR updates the Cody Web CSS based on the changes requested by @rrhyne. Few buttons implemented in Cody doesn't satisfy the design requirements and do not use the css variable so we couldn't update them easily but rather had to override the styles. ## Test plan Before:  After:  ## Changelog - Make Cody Web styles more accessible. <br> Backport 2dd38b3 from #64370 Co-authored-by: Naman Kumar <naman@outlook.in>
cherry-pick 856e41e with resolved conflicts (#64228) <!-- PR description tips: https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e --> Cherry pick changes from https://github.com/sourcegraph/sourcegraph/pull/64227 into release branch ## Test plan tested via sg start with both: - export APPLIANCE_UPDATE_TARGET=http://www.google.com - export APPLIANCE_MENU_TARGET=http://www.warhammer.com <!-- REQUIRED; info at https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles --> ## Changelog <!-- OPTIONAL; info at https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c -->
feat(appliance): backport all recent appliance changes (#64182) Draft in case plan in https://linear.app/sourcegraph/issue/REL-309/release-process-for-appliance not agreed. Please see that first. Generated by: ``` git log --format=%H d47b4cc..origin/main -- cmd/appliance internal/appliance docker-images/appliance-frontend | tac | xargs git cherry-pick ``` d47b4cc being the commit we branched off main from to create the 5.5.x branch (https://buildkite.com/sourcegraph/sourcegraph/builds/281882). Commits (generated by `git log --format='- https://github.com/sourcegraph/sourcegraph/commit/%H' d47b4cc..origin/main -- cmd/appliance internal/appliance docker-images/appliance-frontend | tac`): - https://github.com/sourcegraph/sourcegraph/commit/a20b0650b453d11d7dc428b9f919b79465db088c - https://github.com/sourcegraph/sourcegraph/commit/b71c986c77829cfe3bdc6f2d31e8590fdb969b17 - https://github.com/sourcegraph/sourcegraph/commit/91864283bc0811928188f415e6cda7d3fe940e34 - https://github.com/sourcegraph/sourcegraph/commit/c88b57020fa49fe996e37ca9409a541d48d7a63e - https://github.com/sourcegraph/sourcegraph/commit/0491839942c3087687d0f48ade1c544f1fbcb881 - https://github.com/sourcegraph/sourcegraph/commit/619fc5707415bd50631153bcb1b01c670d44fd82 - https://github.com/sourcegraph/sourcegraph/commit/e81c39a834810a60c8827456963511213eb5f602 - https://github.com/sourcegraph/sourcegraph/commit/a61f353e0e93f848fa476ffda6d46f71060d465d - https://github.com/sourcegraph/sourcegraph/commit/0abef7b43d5dadac92a3ff318f3caf6d7b572f6a - https://github.com/sourcegraph/sourcegraph/commit/0e391a964ae8d21904bd875862759db521feb5ba - https://github.com/sourcegraph/sourcegraph/commit/daae9adfb642f2c73e7b4b2dcb7acca618ae86d3 - https://github.com/sourcegraph/sourcegraph/commit/6e31f0f4cc89ad7d3892e67bad55ab9a0b9658a7 - https://github.com/sourcegraph/sourcegraph/commit/49a600220d5eb2875ab54c87329d0a90f15c38d6 - https://github.com/sourcegraph/sourcegraph/commit/37cf4a7b7e9dfb4f09635d2e04ce30daf5d8b7a0 - https://github.com/sourcegraph/sourcegraph/commit/29fc613c376fe38055fa907c5bbd293ea6e4408f - https://github.com/sourcegraph/sourcegraph/commit/255e6387cc7854c8aed6dfa1445fcade380ec690 - https://github.com/sourcegraph/sourcegraph/commit/49b32fcf3a1ec8362e3be286de182aba76f93917 - https://github.com/sourcegraph/sourcegraph/commit/9f4c160f91838ed3167a38ba62b7ca90ad90a771 - https://github.com/sourcegraph/sourcegraph/commit/3814fd7390455354be1129cdb1b240c201ef5964 - https://github.com/sourcegraph/sourcegraph/commit/c68e92bc28b3ce0878aebe8e10471cca89010b77 - https://github.com/sourcegraph/sourcegraph/commit/7e82c27ab5de1c76f1e877ec9dee665800807cbb - https://github.com/sourcegraph/sourcegraph/commit/98c6b9703f889bb8b706855204276d3528b03356 - https://github.com/sourcegraph/sourcegraph/commit/a01ebad8417d4c14b969f61a3a6ad8e836728047 - https://github.com/sourcegraph/sourcegraph/commit/8c2d8da234cc46b529b8df92a38cdf7f7d83a7a7 - https://github.com/sourcegraph/sourcegraph/commit/ebec72d7ed7046406d22d2bf8276612945db358d - https://github.com/sourcegraph/sourcegraph/commit/d945f192852a7dc3cd2482602fe37f614f82f8a1 - https://github.com/sourcegraph/sourcegraph/commit/84e28998e9d3976b79d858439953d101ca44ab7e ## Test plan Tests pass. ## Changelog - Backport all recent appliance changes. The appliance is still pre-release. --------- Co-authored-by: Jacob Pleiness <jdpleiness@users.noreply.github.com> Co-authored-by: Anish Lakhwara <anish+github@lakhwara.com> Co-authored-by: Warren Gifford <warren@sourcegraph.com> Co-authored-by: Nelson Araujo <nelsonjr@users.noreply.github.com>
[Backport 5.5.x] ci: make internal+promote release higher priority in… … runtypes (#64050) With the https://github.com/sourcegraph/sourcegraph/pull/63985/files PatchRelease is matched before InternalRelease leading to the wrong build being generated. We therefore move the Promote and Internal Release runtypes higher in priority so that they get matched first. ## Test plan ``` export RELEASE_INTERNAL=true export VERSION="5.5.2463" go run ./dev/sg ci preview ``` 👇🏼 ``` go run ./dev/sg ci preview⚠️ Running sg with a dev build, following flags have different default value unless explictly set: skip-auto-update, disable-analytics If the current branch were to be pushed, the following pipeline would be run: Parsed diff: changed files: [WORKSPACE client/web-sveltekit/BUILD.bazel client/web-sveltekit/playwright.config.ts client/web-sveltekit/src/lib/navigation/GlobalHeader.svelte client/web- sveltekit/src/routes/[...repo=reporev]/(validrev)/(code)/page.spec.ts client/web/src/cody/chat/new-chat/NewCodyChatPage.tsx client/web/src/cody/sidebar/new-cody-sidebar/NewCodySidebar.tsx client/web/src/cody/sidebar/new-cody-sidebar/NewCodySidebarWebChat.tsx client/web/src/enterprise/batches/settings/AddCredentialModal.tsx client/web/src/enterprise/batches/settings/BatchChangesCreateGitHubAppPage.tsx client/web/src/repo/blame/hooks.ts client/web/src/repo/blame/shared.ts cmd/frontend/auth/user.go cmd/frontend/auth/user_test.go cmd/frontend/internal/codycontext/context.go cmd/frontend/internal/codycontext/context_test.go deps.bzl dev/ci/push_all.sh dev/ci/runtype/runtype.go go.mod go.sum internal/codeintel/uploads/BUILD.bazel internal/codeintel/uploads/internal/background/backfiller/BUILD.bazel internal/codeintel/uploads/internal/background/backfiller/mocks_test.go internal/codeintel/uploads/internal/background/commitgraph/BUILD.bazel internal/codeintel/uploads/internal/background/commitgraph/job_commitgraph.go internal/codeintel/uploads/internal/background/expirer/BUILD.bazel internal/codeintel/uploads/internal/background/expirer/mocks_test.go internal/codeintel/uploads/internal/background/processor/BUILD.bazel internal/codeintel/uploads/internal/background/processor/mocks_test.go internal/codeintel/uploads/internal/store/BUILD.bazel internal/codeintel/uploads/internal/store/commitdate.go internal/codeintel/uploads/internal/store/commitdate_test.go internal/codeintel/uploads/internal/store/observability.go internal/codeintel/uploads/internal/store/store.go internal/codeintel/uploads/mocks_test.go internal/database/migration/shared/data/cmd/generator/consts.go internal/database/migration/shared/data/stitched-migration-graph.json package.json pnpm-lock.yaml schema/schema.go schema/site.schema.json] diff changes: "Go, Client, pnpm, Docs, Shell" The generated build pipeline will now follow, see you next time! • Detected run type: Internal release • Detected diffs: Go, Client, pnpm, Docs, Shell • Computed variables: • VERSION=5.5.2463 • Computed build steps: • Aspect Workflow specific steps • 🤖 Generated steps that include Buildifier, Gazelle, Test and Integration/E2E tests • Image builds • :bazel::packer: 🚧 Build executor image • :bazel: Bazel prechecks & build sg • :bazel:⏳ BackCompat Tests • :bazel:🧹 Go mod tidy • Linters and static analysis • 🍍:lint-roller: Run sg lint → depends on bazel-prechecks • Client checks • :java: Build (client/jetbrains) • :vscode: Tests for VS Code extension • :stylelint: Stylelint (all) • Security Scanning • Semgrep SAST Scan • Publish candidate images • :bazel::docker: Push candidate Images • End-to-end tests • :bazel::docker::packer: Executors E2E → depends on bazel-push-images-candidate • Publish images • :bazel::packer: ✅ Publish executor image → depends on executor-vm-image:candidate • :bazel:⤴️ Publish executor binary • :bazel::docker: Push final images → depends on main::test main::test_2 • Release • Release tests → depends on bazel-push-images • Finalize internal release ``` ## Changelog <br> Backport 0309564 from #64049 Co-authored-by: William Bezuidenhout <william.bezuidenhout@sourcegraph.com>
[Backport 5.5.x] Upgrade cody web experimental package to 0.2.7 (#63863… …) (#63901) backport https://github.com/sourcegraph/sourcegraph/pull/63863 S2 Cody Web is broken at the moment. New client-config handlers fail with 401 status because we don't send custom headers, this works for gql queries since they all are POST requests and the browser automatically sends an Origin header for them and this is enough for our auth middleware to check cookies, but with client-config which is rest it's not the case and we should send `X-Requested-Client: Sourcegraph` header to make our auth middleware to pass this query correctly Note that this problem doesn't exist in local builds since we proxy all requests and add `X-Requested-Client: Sourcegraph` in dev server. See Cody latest build PR for more details sourcegraph/cody#4898 ## Test plan CI Co-authored-by: Vova Kulikov <vovakulikov@icloud.com>
[Backport 5.5.x] fix(batches): the baseURL for github instance is now… … updated when creating a GitHub app (#63833) Closes SRCH-723 The baseURL for GitHub apps defaults to `https://github.com` when no `externalServiceURL`, we somehow missed this during our testing.  ## Test plan Manual testing with the GHE instance. ## Changelog <br> Backport 1c40c9e from #63803 Co-authored-by: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com> Co-authored-by: Anish Lakhwara <anish+github@lakhwara.com>
[Backport 5.5.x] Context: return lines around symbol match (#63788) This PR fixes an important bug in #62976, where we didn't properly map the symbol line match to the return type. Instead, we accidentally treated symbol matches like file matches and returned the start of the file. ## Test plan Add new unit test for symbol match conversion. Extensive manual testing. <br> Backport 004eb0f from #63773 Co-authored-by: Julie Tibshirani <julietibs@apache.org>
PreviousNext