Skip to content

Commit 5204de9

Browse files
authored
Merge branch 'master' into http-oracle-v2
2 parents a620ea5 + 00041d9 commit 5204de9

File tree

7,120 files changed

+65527
-12761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,120 files changed

+65527
-12761
lines changed

.circleci/config.yml

Lines changed: 0 additions & 85 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 44 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- '!.gitignore'
2121
- '!docs/**'
2222
- '!release_notes.md'
23+
- '!outdated/**'
2324
- 'docs/options.md'
2425
### Unfortunately, had to disable this. Originally added to be able to run CI from PRs from forks (eg from external people).
2526
### But this leads to run CI 2 twice on each push on an open PR, regardless of fork.
@@ -30,19 +31,18 @@ on:
3031
# - "**"
3132

3233
env:
33-
evomaster-version: 3.4.1
34+
evomaster-version: 4.0.1
3435
# Unfortunately, to use JPackage we need JDK 17 or above :(
3536
# Which is really bad due to the madness of --add-opens.
3637
# Even if hunt down all cases of reflections in EM, there is still the problem of
3738
# third-party libraries, which might do it only in special cases.
3839
# For some "hilarious" case, see:
39-
# https://github.com/EMResearch/EvoMaster/issues/447
40+
# https://github.com/WebFuzzing/EvoMaster/issues/447
4041
release-jdk: 21
41-
latest-jdk: 21
42-
build-jdk: 1.8
42+
build-jdk: 17
4343
retention-days: 5
4444
debug: false # put to true if need to debug a specific test
45-
debugTestName: "H2ColumnTypesEMTest" # replace with test to debug
45+
debugTestName: "org.evomaster.e2etests.spring.examples.sort.SortEMTest" # replace with test to debug
4646

4747
# This build is quite expensive (some hours), so we run it whole only on some JVM versions and OSs.
4848
# For the moment, we need to support JVM 8 and all following LTS versions (e.g, 11 and 17).
@@ -83,7 +83,7 @@ jobs:
8383
- name: Debug Test Case
8484
env:
8585
CI_env: GithubAction
86-
run: mvn test -Dtest=${{env.debugTestName}} -Dsurefire.failIfNoSpecifiedTests=false -DredirectTestOutputToFile=false
86+
run: mvn -B install -Dtest=${{env.debugTestName}} -Dsurefire.failIfNoSpecifiedTests=false -DredirectTestOutputToFile=false
8787

8888
full-build-base:
8989
runs-on: ubuntu-latest
@@ -117,11 +117,11 @@ jobs:
117117
# Make test report accessible from GitHub Actions (as Maven logs are long)
118118
- name: Publish Test Report
119119
if: success() || failure()
120-
uses: mikepenz/action-junit-report@v4
120+
uses: mikepenz/action-junit-report@v5
121121
env:
122-
NODE_OPTIONS: "--max_old_space_size=6144"
122+
NODE_OPTIONS: "--max_old_space_size=8000"
123123
with:
124-
report_paths: '**/target/surefire-reports/TEST-*.xml'
124+
report_paths: '**/target/*-reports/TEST-*.xml'
125125
# Upload coverage results
126126
# As of 2024, looks like a rate limiter is breaking the build.
127127
# As such, now we only upload from master branch, hoping it is enough.
@@ -132,29 +132,7 @@ jobs:
132132
- if: github.ref != 'refs/heads/master'
133133
name: Uploading coverage to CodeCov is done only on 'master' branch builds
134134
run: echo Skipping upload to CodeCov
135-
# Only once coverage is uploaded, we try to build with other versions of Java, as "mvn clean" would delete those reports
136-
# However, the latest LTS is fully built (with tests) on a different job
137-
# JDK 11
138-
- name: Setup JDK 11
139-
uses: actions/setup-java@v1
140-
with:
141-
java-version: 11
142-
- name: Compile with JDK 11
143-
run: mvn clean verify -DskipTests
144-
#JDK 17
145-
- name: Setup JDK 17
146-
uses: actions/setup-java@v1
147-
with:
148-
java-version: 17
149-
- name: Compile with JDK 17
150-
run: mvn clean verify -DskipTests
151-
#JDK 21
152-
- name: Setup JDK 21
153-
uses: actions/setup-java@v1
154-
with:
155-
java-version: 21
156-
- name: Compile with JDK 21
157-
run: mvn clean verify -DskipTests
135+
158136

159137

160138
base-build-mac:
@@ -163,10 +141,10 @@ jobs:
163141
if: needs.setup.outputs.debug == 'false'
164142
steps:
165143
- uses: actions/checkout@v4
166-
- name: Setup JDK ${{env.latest-jdk}}
144+
- name: Setup JDK ${{env.release-jdk}}
167145
uses: actions/setup-java@v1
168146
with:
169-
java-version: ${{env.latest-jdk}}
147+
java-version: ${{env.release-jdk}}
170148
- name: Cache Maven packages
171149
uses: actions/cache@v3
172150
with:
@@ -184,10 +162,10 @@ jobs:
184162
if: needs.setup.outputs.debug == 'false'
185163
steps:
186164
- uses: actions/checkout@v4
187-
- name: Setup JDK ${{env.latest-jdk}}
165+
- name: Setup JDK ${{env.release-jdk}}
188166
uses: actions/setup-java@v1
189167
with:
190-
java-version: ${{env.latest-jdk}}
168+
java-version: ${{env.release-jdk}}
191169
- name: Cache Maven packages
192170
uses: actions/cache@v3
193171
with:
@@ -200,32 +178,33 @@ jobs:
200178
CI_env: GithubAction
201179

202180

203-
full-build-LTS:
204-
# run on a different OS from main build.
205-
# It would had been good, but does not work due to Docker support :( see:
206-
# https://stackoverflow.com/questions/66077884/testcontainers-in-windows-environment-on-github-actions-could-not-find-a-valid
207-
# TODO check this again in the future
208-
# runs-on: windows-latest
209-
runs-on: ubuntu-latest
210-
needs: setup
211-
if: needs.setup.outputs.debug == 'false'
212-
steps:
213-
- uses: actions/checkout@v4
214-
- name: Setup JDK ${{env.latest-jdk}}
215-
uses: actions/setup-java@v1
216-
with:
217-
java-version: ${{env.latest-jdk}}
218-
- name: Cache Maven packages
219-
uses: actions/cache@v3
220-
with:
221-
path: ~/.m2
222-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
223-
restore-keys: ${{ runner.os }}-m2
224-
- name: Build with Maven
225-
run: mvn clean verify --fae
226-
env:
227-
CI_env: GithubAction
228-
MAVEN_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
181+
# NOTES we know try to be on latest LTS
182+
# full-build-LTS:
183+
# # run on a different OS from main build.
184+
# # It would had been good, but does not work due to Docker support :( see:
185+
# # https://stackoverflow.com/questions/66077884/testcontainers-in-windows-environment-on-github-actions-could-not-find-a-valid
186+
# # TODO check this again in the future
187+
# # runs-on: windows-latest
188+
# runs-on: ubuntu-latest
189+
# needs: setup
190+
# if: needs.setup.outputs.debug == 'false'
191+
# steps:
192+
# - uses: actions/checkout@v4
193+
# - name: Setup JDK ${{env.latest-jdk}}
194+
# uses: actions/setup-java@v1
195+
# with:
196+
# java-version: ${{env.latest-jdk}}
197+
# - name: Cache Maven packages
198+
# uses: actions/cache@v3
199+
# with:
200+
# path: ~/.m2
201+
# key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
202+
# restore-keys: ${{ runner.os }}-m2
203+
# - name: Build with Maven
204+
# run: mvn clean verify --fae
205+
# env:
206+
# CI_env: GithubAction
207+
# MAVEN_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
229208

230209

231210

@@ -354,10 +333,10 @@ jobs:
354333
if: needs.setup.outputs.debug == 'false'
355334
steps:
356335
- uses: actions/checkout@v4
357-
- name: Setup JDK ${{env.latest-jdk}}
336+
- name: Setup JDK ${{env.build-jdk}}
358337
uses: actions/setup-java@v1
359338
with:
360-
java-version: ${{env.latest-jdk}}
339+
java-version: ${{env.build-jdk}}
361340
- name: Cache Maven packages
362341
uses: actions/cache@v3
363342
with:
@@ -370,7 +349,7 @@ jobs:
370349
CI_env: GithubAction
371350
- name: Run BB E2E tests
372351
# important that what we run here does not use Docker
373-
working-directory: e2e-tests/spring-rest-bb
352+
working-directory: core-tests/e2e-tests/spring/spring-rest-bb
374353
run: mvn clean verify --fae
375354
env:
376355
CI_env: GithubAction

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- "v*"
99

1010
env:
11-
evomaster-version: 3.4.1
11+
evomaster-version: 4.0.1
1212
jdk-jar: 1.8
1313
jdk-jpackage: 21
1414
retention-days: 1
@@ -165,7 +165,7 @@ jobs:
165165
- name: Release
166166
uses: softprops/action-gh-release@v1
167167
with:
168-
body: "See release notes at [release_notes.md](https://github.com/EMResearch/EvoMaster/blob/master/release_notes.md)."
168+
body: "See release notes at [release_notes.md](https://github.com/WebFuzzing/EvoMaster/blob/master/release_notes.md)."
169169
prerelease: false
170170
draft: false
171171
fail_on_unmatched_files: true

0 commit comments

Comments
 (0)