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

aspect: use different dep step key if running as part of aspect (#58676)

Browse Source 
* aspect: use different dep step key if running as part of aspect

* add check for bazel-configure.diff
This commit is contained in:
William Bezuidenhout 2023-11-30 14:48:14 +00:00 committed by GitHub
parent 098afc40a8
commit 9dd486e9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/ci/bazel-prechecks-apply.sh
View File

@ -9,4 +9,6 @@ if [[ $status -ne 0 && "$response" == *"No artifacts found for downloading"* ]];
exit 0
fi
git apply bazel-configure.diff
if [ -f bazel-configure.diff ]; then
git apply bazel-configure.diff
fi

16
dev/ci/internal/ci/bazel_operations.go
View File

@ -42,13 +42,21 @@ func bazelCmd(args ...string) string {
}
// Used in default run type
func bazelPushImagesCandidates(version string) func(*bk.Pipeline) {
return bazelPushImagesCmd(version, true, "bazel-tests")
func bazelPushImagesCandidates(version string, isAspectBuild bool) func(*bk.Pipeline) {
depKey := "bazel-tests"
if isAspectBuild {
depKey = "__main__::test"
}
return bazelPushImagesCmd(version, true, depKey)
}
// Used in default run type
func bazelPushImagesFinal(version string) func(*bk.Pipeline) {
return bazelPushImagesCmd(version, false, "bazel-tests")
func bazelPushImagesFinal(version string, isAspectBuild bool) func(*bk.Pipeline) {
depKey := "bazel-tests"
if isAspectBuild {
depKey = "__main__::test"
}
return bazelPushImagesCmd(version, false, depKey)
}
// Used in CandidateNoTest run type

4
dev/ci/internal/ci/pipeline.go
View File

@ -304,7 +304,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
// Publish candidate images to dev registry
publishOpsDev := operations.NewNamedSet("Publish candidate images")
publishOpsDev.Append(bazelPushImagesCandidates(c.Version))
publishOpsDev.Append(bazelPushImagesCandidates(c.Version, isAspectWorkflowBuild))
ops.Merge(publishOpsDev)
// End-to-end tests
@ -340,7 +340,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
}
}
// Final Bazel images
publishOps.Append(bazelPushImagesFinal(c.Version))
publishOps.Append(bazelPushImagesFinal(c.Version, isAspectWorkflowBuild))
ops.Merge(publishOps)
}