Skip to content

Commit 3f0cec6

Browse files
authored
Merge branch 'master' into dependabot/maven/src/backend/libs/efiling-bom/commons-io-commons-io-2.14.0
2 parents d9b063d + 95d7792 commit 3f0cec6

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/code-climate-coverage-aggregation.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -318,35 +318,35 @@ jobs:
318318

319319
# Download Spring-boot coverage report
320320
- name: Download spring-boot coverage report
321-
uses: actions/download-artifact@v1
321+
uses: actions/download-artifact@v4
322322
with:
323323
name: summed-java-coverage-report
324324

325325
# See what is inside
326326
- name: List items inside java coverage report object
327327
run: |
328-
ls summed-java-coverage-report
328+
ls
329329
330330
# Copy total java to outside directory
331331
- name: Copy Java Coverage to directory
332332
run: |
333-
cp summed-java-coverage-report/total-codeclimate.json coverage-reports/total-java-codeclimate.json
333+
cp total-codeclimate.json coverage-reports/total-java-codeclimate.json
334334
335335
# Download Yarn coverage report
336336
- name: Download javascript coverage report
337-
uses: actions/download-artifact@v1
337+
uses: actions/download-artifact@v4
338338
with:
339339
name: summed-yarn-coverage-report
340340

341341
# See what is inside
342-
- name: List items inside java coverage report object
342+
- name: List items inside javascript coverage report object
343343
run: |
344-
ls summed-yarn-coverage-report
344+
ls
345345
346346
# Copy total Yarn to outside directory
347347
- name: Copy Yarn Coverage to directory
348348
run: |
349-
cp summed-yarn-coverage-report/total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
349+
cp total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
350350
351351
# See what is inside coverage
352352
- name: List items inside java coverage report object

.github/workflows/cucumber-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ jobs:
135135

136136
# pulling images is faster than caching in most of the case
137137
- name: pull available docker images first
138-
run: docker-compose pull -q --parallel redis clamav keycloak
138+
run: docker compose pull -q --parallel redis clamav keycloak
139139

140140
- name: Standup Infra
141-
run: docker-compose up -d redis clamav keycloak
141+
run: docker compose up -d redis clamav keycloak
142142

143143
- name: Login to Docker Hub
144144
uses: docker/login-action@v1
@@ -157,26 +157,26 @@ jobs:
157157
158158
- name: Pull images (Local REPO only)
159159
if: github.event.pull_request.head.repo.full_name == github.repository
160-
run: docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
160+
run: docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
161161

162162
- name: Standup Docker Pods (Local REPO only)
163163
if: github.event.pull_request.head.repo.full_name == github.repository
164-
run: docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
164+
run: docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
165165

166166

167167
- name: Standup Docker Pods (FORK only)
168168
if: github.event.pull_request.head.repo.full_name != github.repository
169-
run: docker-compose up -d efiling-api efiling-frontend
169+
run: docker compose up -d efiling-api efiling-frontend
170170

171171
- name: Configure keycloak (Local REPO only)
172172
if: github.event.pull_request.head.repo.full_name == github.repository
173173
run: |
174-
docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml up keycloak-config
174+
docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml up keycloak-config
175175
176176
- name: Configure keycloak (FORK only)
177177
if: github.event.pull_request.head.repo.full_name != github.repository
178178
run: |
179-
docker-compose up keycloak-config
179+
docker compose up keycloak-config
180180
181181
- name: Running Integration Tests
182182
env:

0 commit comments

Comments
 (0)