[pull] master from sourcegraph:master

.buildkite/hooks/pre-command

@@ -3,6 +3,14 @@
 set -eu
 pushd "$(dirname "${BASH_SOURCE[0]}")"/../..
 
+ORPHAN_ASDF=()
+mapfile ORPHAN_ASDF < <(find "$HOME/.asdf/installs/" -maxdepth 2 -empty)
+
+for dir in "${ORPHAN_ASDF[@]}"; do
+    echo "Removing orphaned .asdf directory: ${dir}"
+    rm -rf "${dir}"
+done
+
 TOOL_VERSION_FILES=()
 mapfile -d $'\0' TOOL_VERSION_FILES < <(fd .tool-versions --hidden --absolute-path --print0)
 

.buildkite/pipeline.async.yml

@@ -0,0 +1,12 @@
+env:
+  ENTERPRISE: "1"
+  MINIFY: "1"
+  FORCE_COLOR: "3"
+
+steps:
+- command:
+  - COVERAGE_INSTRUMENT=true NODE_OPTIONS="--max_old_space_size=4096" dev/ci/yarn-run.sh build-storybook
+  - yarn run cover-storybook
+  - yarn nyc report -r json
+  - bash <(curl -s https://codecov.io/bash) -c -F typescript -F storybook
+  label: ':storybook::codecov: Storybook coverage'

.buildkite/pipeline.codeintel.yml

@@ -0,0 +1,9 @@
+env:
+  VAGRANT_RUN_ENV: "CI"
+steps:
+- label: ':docker::brain: Code Intel'
+  command:
+    - .buildkite/vagrant-run.sh sourcegraph-code-intel-test
+  artifact_paths: ./*.log
+  agents:
+    queue: 'baremetal'

.buildkite/pipeline.e2e.yml

@@ -1,22 +1,9 @@
 env:
-  ENTERPRISE: "1"
-  DOCKER_BUILDKIT: "1"
-  ENTERPRISE: "1"
-  FORCE_COLOR: "3"
-  GO111MODULE: "on"
-  IMAGE: "server_instrumented"
-  TAG: "${BUILDKITE_BUILD_NUMBER}_${BUILDKITE_RETRY_COUNT}"
-  COVERAGE_INSTRUMENT: "true"
-  TEST_USER_PASSWORD: "SuperSecurePassword"
-
+  VAGRANT_RUN_ENV: 'CI'
 steps:
-- artifact_paths: ./puppeteer/*.png;./web/e2e.mp4;./web/ffmpeg.log
-  command:
-    - pushd enterprise
-    - ./cmd/server/pre-build.sh
-    - ./cmd/server/build.sh
-    - popd
-    - ./dev/ci/e2e.sh
-    - docker image rm -f "$IMAGE"
-  timeout_in_minutes: 20
-  label: ':docker::arrow_right::chromium:'
+  - label: ':chromium: Sourcegraph E2E'
+    artifact_paths: ./*.png;./*.mp4;./ffmpeg.log
+    command:
+      - .buildkite/vagrant-run.sh sourcegraph-e2e
+    agents:
+      queue: 'baremetal'

.buildkite/pipeline.qa.yml

@@ -0,0 +1,24 @@
+env:
+  VAGRANT_RUN_ENV: "CI"
+steps:
+- label: ':docker::chromium: Sourcegraph QA'
+  command:
+    - .buildkite/vagrant-run.sh sourcegraph-qa-test
+  artifact_paths: ./*.png;./*.mp4;./*.log
+  agents:
+    queue: 'baremetal'
+
+- label: ':docker::arrow_double_up: Sourcegraph Upgrade'
+  command:
+  - .buildkite/vagrant-run.sh sourcegraph-upgrade
+  artifact_paths: ./*.png;./*.mp4;./*.log
+  agents:
+    queue: 'baremetal'
+
+- label: ":k8s: Sourcegraph Cluster (deploy-sourcegraph) QA"
+  commands:
+    - dev/ci/test/cluster/cluster-test.sh
+  artifact_paths: ./*.png;./*.mp4;./*.log
+  concurrency: 1
+  concurrency_group: "cluster-test"
+  timeout_in_minutes: 30

.buildkite/updater/is-tip-of-main.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.."
+set -euxo pipefail
+
+COMMIT="${BUILDKITE_COMMIT}"
+
+API_SLUG="repos/sourcegraph/sourcegraph/commits"
+function get_branch_tip() {
+  local ref="$1"
+
+  # https://docs.github.com/en/rest/reference/repos#list-commits
+  gh api "${API_SLUG}?sha=${ref}&per_page=1" --jq '.[].sha'
+}
+
+REF="main"
+tip_of_main="$(get_branch_tip ${REF})"
+
+[[ "$tip_of_main" == "$COMMIT" ]]

.buildkite/updater/pipeline.update-trigger.yaml

@@ -0,0 +1,15 @@
+steps:
+  - trigger: 'ds-updater-test-image-updater'
+    label: ':k8s: :arrows_counterclockwise: :construction: Trigger update pipeline for deploy-sourcegraph-updater-test'
+    branches: 'main'
+    async: true
+    build:
+      env:
+        TARGET_COMMIT: '${BUILDKITE_COMMIT}'
+  - trigger: 'deploy-sourcegraph-dogfood-k8s-2-image-updater-pipeline'
+    label: ':k8s: :arrows_counterclockwise: :dog: Trigger update pipeline for deploy-sourcegraph-dogfood-k8s-2'
+    branches: 'main'
+    async: true
+    build:
+      env:
+        TARGET_COMMIT: '${BUILDKITE_COMMIT}'

.buildkite/updater/trigger-if-tip-of-main.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.."
+set -euo pipefail
+
+if ! .buildkite/updater/is-tip-of-main.sh; then
+  echo "🚨 This commit is not the tip of main (either it's behind or an unrelated commit). Skipping deployment triggers..."
+  exit 0 # This is not a failure condition.
+fi
+
+buildkite-agent pipeline upload '.buildkite/updater/pipeline.update-trigger.yaml'

.buildkite/vagrant-run.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/.."
+set -euxo pipefail
+
+box="$1"
+exit_code=0
+
+pushd "dev/ci/test"
+
+cleanup() {
+  echo "--- vagrant status"
+  vagrant status --debug-timestamp "$box"
+
+  echo "--- vagrant destroy"
+  vagrant destroy -f "$box"
+}
+
+# remove log prefix that vagrant inserts so buildkite can interpret control
+# characters from output. For example
+#
+#     sourcegraph-e2e: --- yarn run test-e2e
+#
+# becomes
+#
+# --- yarn run test-e2e
+remove_log_prefix() {
+  # We don't use ^ due to control characters.
+  sed -E "s/    ${box}: (---|\+\+\+|\^\^\^) /\1 /g"
+}
+
+plugins=(vagrant-google vagrant-env vagrant-scp)
+for i in "${plugins[@]}"; do
+  if ! vagrant plugin list --no-tty | grep "$i"; then
+    vagrant plugin install "$i"
+  fi
+done
+
+trap cleanup EXIT
+
+(vagrant up "$box" --provider=google | remove_log_prefix) || exit_code=$?
+
+vagrant scp "${box}:/sourcegraph/puppeteer/*.png" ../../../
+vagrant scp "${box}:/sourcegraph/*.mp4" ../../../
+vagrant scp "${box}:/sourcegraph/*.log" ../../../
+
+if [ "$exit_code" != 0 ]; then
+  exit $exit_code
+fi

.dockerignore

@@ -67,8 +67,6 @@ yarn-error.log
 
 eb-bundle.zip
 
-/cmd/frontend/internal/app/assets/assets_vfsdata.go
-
 /release/
 
 /conf/private
@@ -97,7 +95,7 @@ cmd/indexer/debug
 
 # Web
 node_modules/
-/web
+/client/web
 
 # Extensions
-/packages/sourcegraph-extension-api/dist
+/extension-api/dist

.editorconfig

@@ -11,7 +11,7 @@ indent_size = 4
 [*.go]
 indent_style = tab
 
-[{*.js,*.json,*.yml,*.md,.babelrc,.stylelintrc}]
+[{*.js,*.jsx,*.json,*.yml,*.yaml,*.md,.babelrc,.stylelintrc}]
 indent_size = 2
 
 [*.md]
@@ -24,3 +24,7 @@ switch_case_indent = true
 
 [**/node_modules/**]
 ignore = true
+
+# shfmt shouldn't format third-party script codecov.sh
+[dev/ci/codecov.sh]
+ignore = true

.eslintignore

@@ -0,0 +1,4 @@
+out/
+src/schema/*
+src/graphql-operations.ts
+GH2SG.bookmarklet.js

.eslintrc.js

@@ -13,6 +13,7 @@ const config = {
     ecmaFeatures: {
       jsx: true,
     },
+    EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
     project: __dirname + '/tsconfig.json',
   },
   settings: {
@@ -30,9 +31,12 @@ const config = {
       },
     ],
   },
+  plugins: ['@sourcegraph/sourcegraph', 'monorepo'],
   rules: {
     // Rules that are specific to this repo
     // All other rules should go into https://github.com/sourcegraph/eslint-config
+    'monorepo/no-relative-import': 'error',
+    '@sourcegraph/sourcegraph/check-help-links': 'error',
     'no-restricted-imports': [
       'error',
       {
@@ -46,6 +50,14 @@ const config = {
             message: 'Code using animationFrameScheduler breaks in Firefox when using Sentry.',
           },
         ],
+        patterns: [
+          {
+            group: ['**/enterprise/*'],
+            message: `The OSS product may not pull in any code from the enterprise codebase, to stay a 100% open-source program.
+
+See https://about.sourcegraph.com/community/faq#is-all-of-sourcegraph-open-source for more information.`,
+          },
+        ],
       },
     ],
     'react/forbid-elements': [
@@ -60,6 +72,7 @@ const config = {
         ],
       },
     ],
+    'react/jsx-no-target-blank': ['error', { allowReferrer: true }],
   },
   overrides: [
     {

.gitattributes

@@ -1,4 +1,3 @@
-cmd/frontend/graphqlbackend/schema.go linguist-generated=true
 cmd/repo-updater/repos/testdata/** linguist-generated=true
 **/__fixtures__/** linguist-generated=true
 **/bindata.go linguist-generated=true