Skip to content

Commit 7b2ddf9

Browse files
committed
Cleanup docker host env and ensure proper deps for JUnit
Signed-off-by: Artur Ciocanu <[email protected]>
1 parent 208c68f commit 7b2ddf9

File tree

2 files changed

+21
-41
lines changed

2 files changed

+21
-41
lines changed

.github/workflows/validate.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
with:
5050
distribution: 'temurin'
5151
java-version: ${{ env.JDK_VER }}
52-
- name: Install Stable Docker
53-
id: setup_docker
54-
uses: docker/setup-docker-action@v4
5552
- name: Check Docker version
5653
run: docker version
5754
- name: Set up Dapr CLI
@@ -116,114 +113,76 @@ jobs:
116113
run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
117114
- name: Install jars
118115
run: ./mvnw clean install -DskipTests -q
119-
env:
120-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
121116
- name: Validate workflows example
122117
working-directory: ./examples
123118
run: |
124119
mm.py ./src/main/java/io/dapr/examples/workflows/README.md
125-
env:
126-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
127120
- name: Validate Spring Boot examples
128121
working-directory: ./spring-boot-examples
129122
run: |
130123
mm.py README.md
131-
env:
132-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
133124
- name: Validate Spring Boot Workflow Patterns examples
134125
working-directory: ./spring-boot-examples/workflows/patterns
135126
run: |
136127
mm.py README.md
137-
env:
138-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
139128
- name: Validate Jobs example
140129
working-directory: ./examples
141130
run: |
142131
mm.py ./src/main/java/io/dapr/examples/jobs/README.md
143-
env:
144-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
145132
- name: Validate conversation ai example
146133
working-directory: ./examples
147134
run: |
148135
mm.py ./src/main/java/io/dapr/examples/conversation/README.md
149-
env:
150-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
151136
- name: Validate invoke http example
152137
working-directory: ./examples
153138
run: |
154139
mm.py ./src/main/java/io/dapr/examples/invoke/http/README.md
155-
env:
156-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
157140
- name: Validate invoke grpc example
158141
working-directory: ./examples
159142
run: |
160143
mm.py ./src/main/java/io/dapr/examples/invoke/grpc/README.md
161-
env:
162-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
163144
- name: Validate tracing example
164145
working-directory: ./examples
165146
run: |
166147
mm.py ./src/main/java/io/dapr/examples/tracing/README.md
167-
env:
168-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
169148
- name: Validate expection handling example
170149
working-directory: ./examples
171150
run: |
172151
mm.py ./src/main/java/io/dapr/examples/exception/README.md
173-
env:
174-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
175152
- name: Validate state example
176153
working-directory: ./examples
177154
run: |
178155
mm.py ./src/main/java/io/dapr/examples/state/README.md
179-
env:
180-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
181156
- name: Validate pubsub example
182157
working-directory: ./examples
183158
run: |
184159
mm.py ./src/main/java/io/dapr/examples/pubsub/README.md
185-
env:
186-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
187160
- name: Validate bindings HTTP example
188161
working-directory: ./examples
189162
run: |
190163
mm.py ./src/main/java/io/dapr/examples/bindings/http/README.md
191-
env:
192-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
193164
- name: Validate secrets example
194165
working-directory: ./examples
195166
run: |
196167
mm.py ./src/main/java/io/dapr/examples/secrets/README.md
197-
env:
198-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
199168
- name: Validate unit testing example
200169
working-directory: ./examples
201170
run: |
202171
mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
203-
env:
204-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
205172
- name: Validate Configuration API example
206173
working-directory: ./examples
207174
run: |
208175
mm.py ./src/main/java/io/dapr/examples/configuration/README.md
209-
env:
210-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
211176
- name: Validate actors example
212177
working-directory: ./examples
213178
run: |
214179
mm.py ./src/main/java/io/dapr/examples/actors/README.md
215-
env:
216-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
217180
- name: Validate query state HTTP example
218181
working-directory: ./examples
219182
run: |
220183
mm.py ./src/main/java/io/dapr/examples/querystate/README.md
221-
env:
222-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
223184
- name: Validate streaming subscription example
224185
working-directory: ./examples
225186
run: |
226187
mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md
227-
env:
228-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
229188

pom.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,27 @@
343343
<artifactId>junit-platform-console-standalone</artifactId>
344344
<version>${junit-platform-console.version}</version>
345345
</dependency>
346+
<!-- JUnit Jupiter dependencies - needed for maven-failsafe-plugin test discovery -->
347+
<dependency>
348+
<groupId>org.junit.jupiter</groupId>
349+
<artifactId>junit-jupiter</artifactId>
350+
<version>${junit-bom.version}</version>
351+
</dependency>
352+
<dependency>
353+
<groupId>org.junit.jupiter</groupId>
354+
<artifactId>junit-jupiter-api</artifactId>
355+
<version>${junit-bom.version}</version>
356+
</dependency>
357+
<dependency>
358+
<groupId>org.junit.jupiter</groupId>
359+
<artifactId>junit-jupiter-engine</artifactId>
360+
<version>${junit-bom.version}</version>
361+
</dependency>
362+
<dependency>
363+
<groupId>org.junit.jupiter</groupId>
364+
<artifactId>junit-jupiter-params</artifactId>
365+
<version>${junit-bom.version}</version>
366+
</dependency>
346367
<dependency>
347368
<groupId>io.projectreactor</groupId>
348369
<artifactId>reactor-core</artifactId>

0 commit comments

Comments
 (0)