Skip to content

Commit b2a2448

Browse files
arcuri82arcuri82
committed
Merge branch 'master' of https://github.com/WebFuzzing/EvoMaster into config-enum-set
2 parents aba3ea9 + 5d24cc5 commit b2a2448

14 files changed

Lines changed: 195 additions & 63 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
# the set command makes the build fail if mvn command fails (no change in behavior)
117117
run: |
118118
set -o pipefail
119-
mvn clean verify --fae 2>&1 | tee full-build-base.log
119+
mvn clean verify -DskipTests --fae 2>&1 | tee full-build-base.log
120120
env:
121121
CI_env: GithubAction
122122
- name: Upload full-build-base log for metrics job
@@ -135,17 +135,19 @@ jobs:
135135
retention-days: ${{env.retention-days}}
136136
if-no-files-found: error
137137
# Make test report accessible from GitHub Actions (as Maven logs are long)
138-
- name: Publish Test Report
139-
if: success() || failure()
140-
uses: mikepenz/action-junit-report@v6
141-
env:
142-
NODE_OPTIONS: "--max_old_space_size=9000"
143-
with:
144-
report_paths: '**/target/*-reports/TEST-*.xml'
138+
# Remove? we skipping tests here
139+
# - name: Publish Test Report
140+
# if: success() || failure()
141+
# uses: mikepenz/action-junit-report@v6
142+
# env:
143+
# NODE_OPTIONS: "--max_old_space_size=9000"
144+
# with:
145+
# report_paths: '**/target/*-reports/TEST-*.xml'
145146
# Upload coverage results
146147
# As of 2024, looks like a rate limiter is breaking the build.
147148
# As such, now we only upload from master branch, hoping it is enough.
148149
# If not, might have to remove this
150+
### FIXME this will need updating with other jobs running tests
149151
- if: github.ref == 'refs/heads/master'
150152
name: Upload coverage to CodeCov
151153
run: curl -s https://codecov.io/bash | bash
@@ -371,6 +373,7 @@ jobs:
371373

372374
bb-on-different-os:
373375
strategy:
376+
fail-fast: false
374377
matrix:
375378
# main build is already on ubuntu-latest
376379
os: [windows-latest, macos-latest]
@@ -400,3 +403,39 @@ jobs:
400403
run: mvn clean verify --fae
401404
env:
402405
CI_env: GithubAction
406+
407+
408+
tests:
409+
runs-on: ubuntu-latest
410+
needs: full-build-base
411+
if: needs.setup.outputs.debug == 'false'
412+
strategy:
413+
fail-fast: false
414+
matrix:
415+
profile: [ BaseTests, CoreTests, CoreITTests, OAV3Tests, OAV2Tests, GraphQLTests, MongoTests, H2V1Tests ]
416+
steps:
417+
- uses: actions/checkout@v6
418+
- name: Setup JDK ${{env.build-jdk}}
419+
uses: actions/setup-java@v5
420+
with:
421+
distribution: ${{env.java-distribution}}
422+
java-version: ${{env.build-jdk}}
423+
- name: Cache Maven packages
424+
uses: actions/cache@v5
425+
with:
426+
path: ~/.m2
427+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
428+
restore-keys: ${{ runner.os }}-m2
429+
- name: Build with Maven
430+
run:
431+
mvn -P default-build,${{ matrix.profile }} clean verify --fae
432+
env:
433+
CI_env: GithubAction
434+
- name: Publish Test Report
435+
if: success() || failure()
436+
uses: mikepenz/action-junit-report@v6
437+
env:
438+
NODE_OPTIONS: "--max_old_space_size=9000"
439+
with:
440+
check_name: JUnit ${{ matrix.profile }}
441+
report_paths: '**/target/*-reports/TEST-*.xml'

‎core-tests/e2e-tests/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,5 @@
5656
</pluginManagement>
5757
</build>
5858

59-
<profiles>
60-
<profile>
61-
<id>Configs for JDK >= 17</id>
62-
<activation>
63-
<jdk>[17,)</jdk>
64-
</activation>
65-
<!--
66-
This module should be enabled after Spring2 dependencies
67-
are pulled down to each e2e project
68-
-->
69-
<!-- <modules>-->
70-
<!-- <module>spring-rest-jakarta</module>-->
71-
<!-- </modules>-->
72-
</profile>
73-
</profiles>
7459

7560
</project>

‎core-tests/e2e-tests/spring/spring-graphql/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<artifactId>evomaster-e2e-tests-spring-graphql</artifactId>
1313
<packaging>jar</packaging>
1414

15+
<properties>
16+
<skipTests>${skipGraphQL}</skipTests>
17+
</properties>
1518

1619
<dependencies>
1720

‎core-tests/e2e-tests/spring/spring-rest-h2-v1/pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<artifactId>evomaster-e2e-tests-spring-rest-h2-v1</artifactId>
1212
<packaging>jar</packaging>
1313

14+
<properties>
15+
<skipTests>${skipH2V1}</skipTests>
16+
</properties>
1417

1518
<dependencies>
1619

@@ -177,13 +180,6 @@
177180
</plugins>
178181
</build>
179182

180-
<profiles>
181-
<profile>
182-
<id>skipE2E_V2</id>
183-
<properties>
184-
<maven.test.skip>true</maven.test.skip>
185-
</properties>
186-
</profile>
187-
</profiles>
183+
188184

189185
</project>

‎core-tests/e2e-tests/spring/spring-rest-h2-v2/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@
180180
</plugins>
181181
</build>
182182

183-
<profiles>
184-
<profile>
185-
<id>skipE2E_V2</id>
186-
<properties>
187-
<maven.test.skip>true</maven.test.skip>
188-
</properties>
189-
</profile>
190-
</profiles>
183+
191184

192185
</project>

‎core-tests/e2e-tests/spring/spring-rest-h2-z3solver/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@
180180
</plugins>
181181
</build>
182182

183-
<profiles>
184-
<profile>
185-
<id>skipE2E_V2</id>
186-
<properties>
187-
<maven.test.skip>true</maven.test.skip>
188-
</properties>
189-
</profile>
190-
</profiles>
183+
191184

192185
</project>

‎core-tests/e2e-tests/spring/spring-rest-jakarta/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,5 @@
6262
</dependencies>
6363

6464

65-
<profiles>
66-
<profile>
67-
<id>skipE2E_V2</id>
68-
<properties>
69-
<maven.test.skip>true</maven.test.skip>
70-
</properties>
71-
</profile>
72-
</profiles>
7365

7466
</project>

‎core-tests/e2e-tests/spring/spring-rest-mongo/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<artifactId>evomaster-e2e-tests-spring-rest-mongo</artifactId>
1414
<packaging>jar</packaging>
1515

16+
<properties>
17+
<skipTests>${skipMongo}</skipTests>
18+
</properties>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>org.evomaster</groupId>

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<artifactId>evomaster-e2e-tests-spring-rest-openapi-v3</artifactId>
1212
<packaging>jar</packaging>
1313

14+
<properties>
15+
<skipTests>${skipOAV3}</skipTests>
16+
</properties>
1417

1518
<dependencies>
1619

‎core-tests/e2e-tests/spring/spring-web/pom.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,6 @@
122122
</plugins>
123123
</build>
124124

125-
<profiles>
126-
<profile>
127-
<id>skipE2E_V2</id>
128-
<properties>
129-
<maven.test.skip>true</maven.test.skip>
130-
</properties>
131-
</profile>
132-
</profiles>
125+
133126

134127
</project>

0 commit comments

Comments
 (0)