Skip to content

Commit 770b5f5

Browse files
committed
CI update to avoid tmp, comments cleanup
1 parent 3780c04 commit 770b5f5

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: MicroProfile Starter Tests
1+
name: Tests
22

33
on:
44
push:
@@ -31,7 +31,7 @@ env:
3131

3232
jobs:
3333
run-starter:
34-
name: MicroProfile Starter ${{ matrix.runtime }}
34+
name: ${{ matrix.runtime }} MicroProfile Starter
3535
runs-on: ubuntu-20.04
3636
strategy:
3737
fail-fast: false
@@ -69,14 +69,14 @@ jobs:
6969
check-latest: true
7070
- name: Build and run tests for Starter
7171
run: |
72-
mvn clean verify -Pthorntail -Dtest=TestMatrixTest#${{ matrix.runtime }}*
72+
mvn clean verify -Pthorntail -Dtest=TestMatrixTest#${{ matrix.runtime }}* -DSTARTER_TS_WORKSPACE=$RUNNER_TEMP
7373
- name: Prepare failure archive (if maven failed)
7474
if: failure()
7575
shell: bash
76-
run: find . -type d -name '*-reports' -o -name "*.log" | tar -czf test-reports.tgz -T -
76+
run: find . -type d -name '*-reports' -o -name "*.log" | tar -czf test-reports-${{ matrix.runtime }}.tgz -T -
7777
- name: Upload failure Archive (if maven failed)
7878
uses: actions/upload-artifact@v2
7979
if: failure()
8080
with:
81-
name: test-reports
82-
path: 'test-reports.tgz'
81+
name: test-reports-${{ matrix.runtime }}
82+
path: 'test-reports-${{ matrix.runtime }}.tgz'

src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@ public void testWebPages(String urlBase, String homePage, String supportedServer
236236
} else if (supportedServer.equalsIgnoreCase("WILDFLY")) {
237237
// Wildfly has a special port
238238
specialUrlBase = urlBase.replace(SupportedServer.WILDFLY.getPortServiceA(), "9990");
239-
// Pertinent for Q 2.x+, also in index.html
240-
//} else if (supportedServer.equalsIgnoreCase("QUARKUS")) {
241-
// // Quarkus prepends /q
242-
// specialUrlBase = urlBase + "q/";
243239
} else {
244240
specialUrlBase = urlBase;
245241
}
@@ -259,7 +255,7 @@ public void testWebPages(String urlBase, String homePage, String supportedServer
259255
testWeb(urlBase + MPSpecGET.METRICS.urlContent[0][0], 5, MPSpecGET.METRICS.urlContent[0][1]);
260256
testWeb(specialUrlBase + MPSpecGET.METRICS.urlContent[1][0], 10, MPSpecGET.METRICS.urlContent[1][1]);
261257
testWeb(urlBase + MPSpecGET.JWT_AUTH.urlContent[0][0], 5, MPSpecGET.JWT_AUTH.urlContent[0][1]);
262-
if (supportedServer.equalsIgnoreCase("TOMEE") || supportedServer.equalsIgnoreCase("QUARKUS")) {
258+
if (supportedServer.equalsIgnoreCase("TOMEE")) {
263259
testWeb(specialUrlBase + MPSpecGET.OPEN_API.urlContent[0][0], 5, MPSpecGET.OPEN_API.urlContent[0][1]);
264260
} else {
265261
testWeb(urlBase + MPSpecGET.OPEN_API.urlContent[0][0], 5, MPSpecGET.OPEN_API.urlContent[0][1]);
@@ -274,7 +270,7 @@ public void testWebPages(String urlBase, String homePage, String supportedServer
274270
testWeb(specialUrlBase + MPSpecGET.HEALTH_CHECKS.urlContent[0][0], 5, MPSpecGET.HEALTH_CHECKS.urlContent[0][1]);
275271
testWeb(urlBase + MPSpecGET.METRICS.urlContent[0][0], 5, MPSpecGET.METRICS.urlContent[0][1]);
276272
testWeb(specialUrlBase + MPSpecGET.METRICS.urlContent[1][0], 5, MPSpecGET.METRICS.urlContent[1][1]);
277-
if (supportedServer.equalsIgnoreCase("TOMEE") || supportedServer.equalsIgnoreCase("QUARKUS")) {
273+
if (supportedServer.equalsIgnoreCase("TOMEE")) {
278274
testWeb(specialUrlBase + MPSpecGET.OPEN_API.urlContent[0][0], 5, MPSpecGET.OPEN_API.urlContent[0][1]);
279275
} else {
280276
testWeb(urlBase + MPSpecGET.OPEN_API.urlContent[0][0], 5, MPSpecGET.OPEN_API.urlContent[0][1]);

0 commit comments

Comments
 (0)