Skip to content

Commit 37ef752

Browse files
mlegnerjuagargi
authored andcommitted
build: allow building without scion-ci (scionproto#4449)
The default target remains unchanged but is renamed to `build-dev`. The target `build` now only builds the main SCION services.
1 parent ddef5aa commit 37ef752

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ steps:
118118
- label: "E2E: default :docker: (ping)"
119119
command:
120120
- echo "--- build"
121-
- make build docker-images
121+
- make build-dev docker-images
122122
- echo "--- start topology"
123123
- ./scion.sh topology -d
124124
- ./scion.sh run

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
.PHONY: all antlr bazel clean docker-images gazelle go.mod licenses mocks protobuf scion-topo test test-integration write_all_source_files
1+
.PHONY: all build build-dev antlr clean docker-images gazelle go.mod licenses mocks protobuf scion-topo test test-integration write_all_source_files
22

3-
build: bazel
3+
build-dev:
4+
rm -f bin/*
5+
bazel build //:scion //:scion-ci
6+
tar -kxf bazel-bin/scion.tar -C bin
7+
tar -kxf bazel-bin/scion-ci.tar -C bin
8+
9+
build:
10+
rm -f bin/*
11+
bazel build //:scion
12+
tar -kxf bazel-bin/scion.tar -C bin
413

514
# all: performs the code-generation steps and then builds; the generated code
615
# is git controlled, and therefore this is only necessary when changing the
716
# sources for the code generation.
817
# Use NOTPARALLEL to force correct order.
918
# Note: From GNU make 4.4, this still allows building any other targets (e.g. lint) in parallel.
1019
.NOTPARALLEL: all
11-
all: go_deps.bzl protobuf mocks gazelle build antlr write_all_source_files licenses
20+
all: go_deps.bzl protobuf mocks gazelle build-dev antlr write_all_source_files licenses
1221

1322
clean:
1423
bazel clean
@@ -18,12 +27,6 @@ scrub:
1827
bazel clean --expunge
1928
rm -f bin/*
2029

21-
bazel:
22-
rm -f bin/*
23-
bazel build //:scion //:scion-ci
24-
tar -kxf bazel-bin/scion.tar -C bin
25-
tar -kxf bazel-bin/scion-ci.tar -C bin
26-
2730
test:
2831
bazel test --config=unit_all
2932

doc/dev/setup.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ Bazel
7272
7373
make
7474
75+
.. hint:: This builds tools for tests in addition to the main SCION services (e.g., `end2end`);
76+
if you don't require those, you can only build the SCION services by running ``make build``.
77+
7578
#. Finally, check that tests run correctly:
7679

7780
.. code-block:: bash

0 commit comments

Comments
 (0)