artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 17:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace single-program with app in some config files (#49091)

Browse Source 
Follow-up to #49064

The recent change broke `sg start app` and this fixes it

## Test plan

- `sg start app` works again

<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->
This commit is contained in:
Philipp Spiess 2023-03-10 13:36:20 +01:00 committed by GitHub
parent 3149cd6d94
commit d62185906f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
enterprise/dev/app/goreleaser.yaml
View File

@ -19,7 +19,7 @@ builds:
ldflags: &ldflags
- -X github.com/sourcegraph/sourcegraph/internal/version.version={{.Version}}
- -X github.com/sourcegraph/sourcegraph/internal/version.timestamp={{.Timestamp}}
- -X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=single-program
- -X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=app
flags: &goflags
- -trimpath
- -v

6
sg.config.yaml
View File

@ -128,7 +128,6 @@ env:
# OTEL_EXPORTER_OTLP_ENDPOINT: http://127.0.0.1:4318
# OTEL_EXPORTER_OTLP_PROTOCOL: http/json
commands:
server:
description: Run an all-in-one sourcegraph/server image
@ -856,7 +855,7 @@ commands:
if [ -n "$DELVE" ]; then
export GCFLAGS='all=-N -l'
fi
go build -gcflags="$GCFLAGS" -ldflags="-X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=single-program" -o .bin/sourcegraph github.com/sourcegraph/sourcegraph/enterprise/cmd/sourcegraph
go build -gcflags="$GCFLAGS" -ldflags="-X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=app" -o .bin/sourcegraph github.com/sourcegraph/sourcegraph/enterprise/cmd/sourcegraph
checkBinary: .bin/sourcegraph
env:
ENTERPRISE: 1
@ -879,7 +878,7 @@ commands:
if [ -n "$DELVE" ]; then
export GCFLAGS='all=-N -l'
fi
go build -gcflags="$GCFLAGS" -ldflags="-X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=single-program" -o .bin/sourcegraph-oss github.com/sourcegraph/sourcegraph/cmd/sourcegraph-oss
go build -gcflags="$GCFLAGS" -ldflags="-X github.com/sourcegraph/sourcegraph/internal/conf/deploy.forceType=app" -o .bin/sourcegraph-oss github.com/sourcegraph/sourcegraph/cmd/sourcegraph-oss
checkBinary: .bin/sourcegraph-oss
env:
WEBPACK_DEV_SERVER: 1
@ -997,7 +996,6 @@ bazelCommands:
EXECUTOR_QUEUE_NAME: codeintel
TMPDIR: $HOME/.sourcegraph/indexer-temp
#
# CommandSets ################################################################
#