Skip to content

Commit 9ad7cc3

Browse files
tdsteintdstein
committed
fix makefile
1 parent 3bed626 commit 9ad7cc3

File tree

1 file changed

+69
-69
lines changed

1 file changed

+69
-69
lines changed

‎integration/Makefile‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@ CONNECT_BOOTSTRAP_SECRETKEY ?= $(shell head -c 32 /dev/random | base64)
1111
.DEFAULT_GOAL := latest
1212

1313
.PHONY: $(CONNECT_VERSIONS) \
14-
all \
15-
build \
16-
down \
17-
down-% \
18-
latest \
19-
test \
20-
up \
21-
up-% \
22-
help
14+
all \
15+
build \
16+
down \
17+
down-% \
18+
latest \
19+
test \
20+
up \
21+
up-% \
22+
help
2323

2424
# Versions
2525
CONNECT_VERSIONS := 2024.09.0 \
26-
2024.08.0 \
27-
2024.06.0 \
28-
2024.05.0 \
29-
2024.04.1 \
30-
2024.04.0 \
31-
2024.03.0 \
32-
2024.02.0 \
33-
2024.01.0 \
34-
2023.12.0 \
35-
2023.10.0 \
36-
2023.09.0 \
37-
2023.07.0 \
38-
2023.06.0 \
39-
2023.05.0 \
40-
2023.01.1 \
41-
2023.01.0 \
42-
2022.12.0 \
43-
2022.11.0
26+
2024.08.0 \
27+
2024.06.0 \
28+
2024.05.0 \
29+
2024.04.1 \
30+
2024.04.0 \
31+
2024.03.0 \
32+
2024.02.0 \
33+
2024.01.0 \
34+
2023.12.0 \
35+
2023.10.0 \
36+
2023.09.0 \
37+
2023.07.0 \
38+
2023.06.0 \
39+
2023.05.0 \
40+
2023.01.1 \
41+
2023.01.0 \
42+
2022.12.0 \
43+
2022.11.0
4444

4545
clean:
46-
rm -rf logs reports
47-
find . -type d -empty -delete
46+
rm -rf logs reports
47+
find . -type d -empty -delete
4848

4949
# Run test suite for a specific Connect version.
5050
#
@@ -61,19 +61,19 @@ all: $(CONNECT_VERSIONS:%=%) preview
6161

6262
# Run test suite against latest Connect version.
6363
latest:
64-
$(MAKE) $(firstword $(CONNECT_VERSIONS))
64+
$(MAKE) $(firstword $(CONNECT_VERSIONS))
6565

6666
# Run test suite against preview Connect version.
6767
preview:
68-
$(MAKE) \
69-
DOCKER_CONNECT_IMAGE=rstudio/rstudio-connect-preview \
70-
DOCKER_CONNECT_IMAGE_TAG=dev-jammy-daily \
71-
down-preview up-preview
68+
$(MAKE) \
69+
DOCKER_CONNECT_IMAGE=rstudio/rstudio-connect-preview \
70+
DOCKER_CONNECT_IMAGE_TAG=dev-jammy-daily \
71+
down-preview up-preview
7272

7373
# Build Dockerfile
7474
build:
75-
make -C .. $(UV_LOCK)
76-
docker build -t $(DOCKER_PROJECT_IMAGE_TAG) ..
75+
make -C .. $(UV_LOCK)
76+
docker build -t $(DOCKER_PROJECT_IMAGE_TAG) ..
7777

7878
# Tear down resources.
7979
#
@@ -87,12 +87,12 @@ down: $(CONNECT_VERSIONS:%=down-%)
8787
down-%: DOCKER_CONNECT_IMAGE_TAG=jammy-$*
8888
down-%: CONNECT_VERSION=$*
8989
down-%:
90-
CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
91-
DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
92-
DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
93-
CONNECT_VERSION=$* \
94-
DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
95-
$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) down -v
90+
CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
91+
DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
92+
DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
93+
CONNECT_VERSION=$* \
94+
DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
95+
$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) down -v
9696

9797
# Create, start, and run Docker Compose.
9898
#
@@ -104,39 +104,39 @@ up: $(CONNECT_VERSIONS:%=up-%)
104104
up-%: CONNECT_VERSION=$*
105105
up-%: DOCKER_CONNECT_IMAGE_TAG=jammy-$*
106106
up-%: build
107-
CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
108-
DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
109-
DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
110-
CONNECT_VERSION=$* \
111-
DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
112-
$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) up -V --abort-on-container-exit --no-build
107+
CONNECT_BOOTSTRAP_SECRETKEY=$(CONNECT_BOOTSTRAP_SECRETKEY) \
108+
DOCKER_CONNECT_IMAGE=$(DOCKER_CONNECT_IMAGE) \
109+
DOCKER_CONNECT_IMAGE_TAG=$(DOCKER_CONNECT_IMAGE_TAG) \
110+
CONNECT_VERSION=$* \
111+
DOCKER_PROJECT_IMAGE_TAG=$(DOCKER_PROJECT_IMAGE_TAG) \
112+
$(DOCKER_COMPOSE) -p $(PROJECT_NAME)-$(subst .,-,$(CONNECT_VERSION)) up -V --abort-on-container-exit --no-build
113113

114114
# Show help message.
115115
help:
116-
@echo "Makefile Targets:"
117-
@echo " all (default) Run test suite for all Connect versions."
118-
@echo " latest Run test suite for latest Connect version."
119-
@echo " preview Run test suite for preview Connect version."
120-
@echo " <version> Run test suite for the specified Connect version. (e.g., make 2024.05.0)"
121-
@echo " up Start Docker Compose for all Connect version."
122-
@echo " down Tear down Docker resources for all Connect versions."
123-
@echo " clean Clean up the project directory."
124-
@echo " help Show this help message."
125-
@echo
126-
@echo "Common Usage:"
127-
@echo " make -j 4 Run test suite in parallel for all Connect versions."
128-
@echo " make latest Run test suite for latest Connect version."
129-
@echo " make preview Run test suite for preview Connect version."
130-
@echo " make 2024.05.0 Run test suite for specific Connect version."
116+
@echo "Makefile Targets:"
117+
@echo " all (default) Run test suite for all Connect versions."
118+
@echo " latest Run test suite for latest Connect version."
119+
@echo " preview Run test suite for preview Connect version."
120+
@echo " <version> Run test suite for the specified Connect version. (e.g., make 2024.05.0)"
121+
@echo " up Start Docker Compose for all Connect version."
122+
@echo " down Tear down Docker resources for all Connect versions."
123+
@echo " clean Clean up the project directory."
124+
@echo " help Show this help message."
125+
@echo
126+
@echo "Common Usage:"
127+
@echo " make -j 4 Run test suite in parallel for all Connect versions."
128+
@echo " make latest Run test suite for latest Connect version."
129+
@echo " make preview Run test suite for preview Connect version."
130+
@echo " make 2024.05.0 Run test suite for specific Connect version."
131131

132132
# Run tests.
133133
#
134134
# Typically call from docker-compose.yaml. Assumes Connect server is running
135135
# on local network.
136136
test:
137-
mkdir -p logs
138-
set -o pipefail; \
139-
CONNECT_VERSION=${CONNECT_VERSION} \
140-
CONNECT_API_KEY="$(shell $(UV) run rsconnect bootstrap -i -s http://connect:3939 --raw)" \
141-
$(UV) run pytest -s --junit-xml=./reports/$(CONNECT_VERSION).xml | \
142-
tee ./logs/$(CONNECT_VERSION).log;
137+
mkdir -p logs
138+
set -o pipefail; \
139+
CONNECT_VERSION=${CONNECT_VERSION} \
140+
CONNECT_API_KEY="$(shell $(UV) run rsconnect bootstrap -i -s http://connect:3939 --raw)" \
141+
$(UV) run pytest -s --junit-xml=./reports/$(CONNECT_VERSION).xml | \
142+
tee ./logs/$(CONNECT_VERSION).log;

0 commit comments

Comments
 (0)