Skip to content

Commit d30796d

Browse files
authored
Turn the docker Makefile target into an e2e full target (#673)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent cfb7566 commit d30796d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v4
3131

32-
- run: make docker PRESET=Release ${{ matrix.edition.options }}
32+
- run: make docker-build PRESET=Release ${{ matrix.edition.options }}
3333

3434
- name: SBOM (Enterprise)
3535
run: |

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ EDITION = $(if $(filter ON,$(ENTERPRISE)),enterprise,community)
2929
.PHONY: all
3030
all: configure compile test
3131

32+
# Useful to run the entire main suite in a single command
33+
.PHONY: docker
34+
docker:
35+
$(MAKE) docker-build
36+
$(MAKE) docker-sandbox-build
37+
$(MAKE) docker-sandbox-up
38+
$(MAKE) test-e2e test-ui; \
39+
status=$$?; $(MAKE) docker-sandbox-down; exit $$status
40+
3241
node_modules: package.json package-lock.json
3342
$(NPM) ci
3443

@@ -102,8 +111,8 @@ sandbox: sandbox-index
102111
$(PREFIX)/bin/sourcemeta-one-server \
103112
$(realpath $(OUTPUT)/sandbox) $(SANDBOX_PORT)
104113

105-
.PHONY: docker
106-
docker: $(DOCKERFILE)
114+
.PHONY: docker-build
115+
docker-build: $(DOCKERFILE)
107116
$(DOCKER) build --tag one . --file $< --progress plain \
108117
--build-arg SOURCEMETA_ONE_BUILD_TYPE=$(PRESET) \
109118
--build-arg SOURCEMETA_ONE_PARALLEL=$(PARALLEL)

0 commit comments

Comments
 (0)