Skip to content

Commit 6427404

Browse files
authored
Merge branch 'sourcegraph:main' into main
2 parents 948b57e + 098afc4 commit 6427404

File tree

894 files changed

+21807
-13252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

894 files changed

+21807
-13252
lines changed

.aspect/bazelrc/ci.sourcegraph.bazelrc

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,47 @@ try-import %workspace%/.aspect/bazelrc/ci.generated.bazelrc
55
# Use repo caching for building and testing.
66
# Article: https://buildkite.com/blog/how-bazel-built-its-ci-system-on-top-of-buildkite
77
# Docs: https://bazel.build/reference/command-line-reference#flag--repository_cache
8-
build --repository_cache=/home/buildkite/repocache-sourcegraph
8+
common --repository_cache=/home/buildkite/repocache-sourcegraph
99

1010
# We need /usr/local/bin
1111
# TODO(DevX) we should be narrower here.
12-
build --test_env=PATH
12+
common --test_env=PATH
1313

1414
# Needed for DB in CI
15-
build --test_env=PGUSER
16-
build --test_env=PGSSLMODE
17-
build --test_env=PGDATABASE
15+
common --test_env=PGUSER=postgres
16+
common --test_env=PGPASSWORD=postgres
17+
common --test_env=PGSSLMODE=disable
18+
common --test_env=PGDATABASE=postgres
1819

1920
# Allow tests to understand they're running in CI, which forces dbtest to drop database even in case of failures.
2021
# TODO(JH) we should instead wipe all templates after a job finishes.
21-
build --test_env=CI
22+
common --test_env=CI
2223

2324
# Ensure we're not exhausting database connections.
24-
build --test_env=GOMAXPROCS=10
25-
build --test_env=TESTDB_MAXOPENCONNS=15
25+
common --test_env=GOMAXPROCS=10
26+
common --test_env=TESTDB_MAXOPENCONNS=15
2627

2728
# Needed for E2E
28-
build --test_env=BUILDKITE
29+
common --test_env=BUILDKITE
2930

3031
# Needed for mocha tests
3132
# We have to use the `--define` flag here instead of `--test_env` because
3233
# the mocha tests target is the build target and it's tested with `build_test`.
33-
build --define=E2E_HEADLESS=false
34-
build --define=E2E_SOURCEGRAPH_BASE_URL="http://localhost:7080"
35-
build --define=DISPLAY=:99
34+
common --define=E2E_HEADLESS=false
35+
# if we set this to localhost, chrome will refuse to conenct since local host is in its HTTP Strict Transport Security
36+
# by setting the loopback address we get passed that
37+
common --define=E2E_SOURCEGRAPH_BASE_URL="http://127.0.0.1:7080"
38+
common --define=DISPLAY=:99
3639

3740
# Provides git commit, branch information to build targets like Percy via status file.
3841
# https://bazel.build/docs/user-manual#workspace-status
39-
build --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh
42+
common --workspace_status_command=./dev/bazel_buildkite_stamp_vars.sh
4043

4144
# temp
42-
build --test_env=INCLUDE_ADMIN_ONBOARDING=false
45+
common --test_env=INCLUDE_ADMIN_ONBOARDING=false
4346

4447
# Used for container_structure_tests
45-
build --test_env=DOCKER_HOST
48+
common --test_env=DOCKER_HOST
4649

4750
# Used by migration rules
48-
build --action_env=PGUSER=postgres
51+
common --action_env=PGUSER=postgres

.aspect/bazelrc/performance.bazelrc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,3 @@ build --experimental_reuse_sandbox_directories
2727
# author.
2828
# Docs: https://bazel.build/reference/command-line-reference#flag--legacy_external_runfiles
2929
build --nolegacy_external_runfiles
30-
31-
# Some actions are always IO-intensive but require little compute. It's wasteful to put the output
32-
# in the remote cache, it just saturates the network and fills the cache storage causing earlier
33-
# evictions. It's also not worth sending them for remote execution.
34-
# For actions like PackageTar it's usually faster to just re-run the work locally every time.
35-
# You'll have to look at an execution log to figure out what other action mnemonics you care about.
36-
# In some cases you may need to patch rulesets to add a mnemonic to actions that don't have one.
37-
# https://bazel.build/reference/command-line-reference#flag--modify_execution_info
38-
build --modify_execution_info=PackageTar=+no-remote

.aspect/workflows/bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
common --remote_download_minimal
2+
common --nobuild_runfile_links
3+
common --noexperimental_reuse_sandbox_directories

.aspect/workflows/config.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
bazel:
3+
rcfiles:
4+
- ".aspect/bazelrc/ci.sourcegraph.bazelrc"
5+
flags:
6+
# This flag is required because otherwise the integration tests fail with `fcmod` Operation not permitted
7+
# which is probably related to the launced containers writing to mapped in directories as root and then
8+
# when the container exits the files that are left over are root.
9+
# TODO(burmudar): launch containers with uid/guid mapped in
10+
- --noexperimental_reuse_sandbox_directories
11+
env:
12+
REDIS_CACHE_ENDPOINT: ":6379"
13+
GIT_PAGER: ''
14+
tasks:
15+
# Checks that BUILD files are formatted
16+
buildifier:
17+
# Checks that BUILD file content is up-to-date with sources
18+
gazelle:
19+
target: //:configure
20+
fix_target: //:configure
21+
# Checks that all tests are passing
22+
test:
23+
include_eternal_tests: true
24+
targets:
25+
- //...
26+
- //testing:grpc_backend_integration_test
27+
# This target should only really run when on main which we aren't handling. For the time being while we
28+
# evaluate Aspect Workflows it is ok
29+
# TODO(burmudar): Let this only run on main branch
30+
- //testing:codeintel_integration_test

.eslintrc.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ const config = {
1717
'**/vendor/*.js',
1818
'svelte.config.js',
1919
'vite.config.ts',
20+
'vitest.config.ts',
21+
'postcss.config.js',
2022
'playwright.config.ts',
23+
'bundlesize.config.js',
24+
'prettier.config.js',
25+
'svgo.config.js',
2126
'.vscode-test',
2227
'**/*.json',
2328
'**/*.d.ts',
2429
'eslint-relative-formatter.js',
2530
'typedoc.js',
26-
'bundlesize.config.js',
31+
'client/web/dev/**/*',
32+
'graphql-schema-linter.config.js',
2733
],
2834
extends: ['@sourcegraph/eslint-config', 'plugin:storybook/recommended'],
2935
env: {
@@ -37,8 +43,8 @@ const config = {
3743
ecmaFeatures: {
3844
jsx: true,
3945
},
40-
EXPERIMENTAL_projectService: true,
41-
project: __dirname + '/tsconfig.all.json',
46+
EXPERIMENTAL_useProjectService: true,
47+
project: true,
4248
},
4349
settings: {
4450
react: {

.github/CODEOWNERS

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/good_first_issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ T-shirt size estimate: **S**.
3737
## Contributors
3838

3939
1. Check out [contributing guidelines](https://github.com/sourcegraph/sourcegraph/blob/main/CONTRIBUTING.md).
40-
2. Join the Sourcegraph [Community Space](https://srcgr.ph/join-community-space) on Slack and join the `#help` channel where the Sourcegraph team can help you!
40+
2. Join the Sourcegraph [Community Space](https://srcgr.ph/join-community-space) on Discord where the Sourcegraph team can help you!
4141
3. Check out [the good first issues board](https://github.com/orgs/sourcegraph/projects/210) to find more curated issues.

.github/workflows/licenses-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
ruby-version: "3.2.2" # Not needed with a .ruby-version file - uses: actions/setup-ruby@v1
3535
- uses: actions/setup-go@v2
36-
with: { go-version: "1.20" }
36+
with: { go-version: "1.21" }
3737

3838

3939
- name: Install license_finder

.github/workflows/pr-auditor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
repository: 'sourcegraph/pr-auditor'
1515
- uses: actions/setup-go@v4
16-
with: { go-version: '1.20' }
16+
with: { go-version: '1.21' }
1717

1818
- run: './check-pr.sh'
1919
env:

.github/workflows/sg-binary-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
- name: Install Go
101101
uses: actions/setup-go@v2
102102
with:
103-
go-version: 1.20.8
103+
go-version: 1.21.4
104104

105105
- name: Build and upload macOS
106106
if: startsWith(matrix.os, 'macos-') == true

0 commit comments

Comments
 (0)