Skip to content

Commit 5c54ac5

Browse files
committed
Merge branch 'master' of https://github.com/WebFuzzing/EvoMaster into enable-new-security
2 parents c8ad3af + d14a9aa commit 5c54ac5

3 files changed

Lines changed: 32 additions & 4 deletions

File tree

.github/workflows/release.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
evomaster-version: 5.1.1
1212
jdk-jar: 17
1313
jdk-jpackage: 21
14+
java-distribution: temurin
1415
retention-days: 1
1516
## Doesn't work, ie, use env in env
1617
# installer-windows: evomaster-${evomaster-version}.msi
@@ -24,9 +25,10 @@ jobs:
2425
steps:
2526
- uses: actions/checkout@v4
2627
- name: Setup JDK ${{env.jdk-jar}}
27-
uses: actions/setup-java@v1
28+
uses: actions/setup-java@v5
2829
with:
2930
java-version: ${{env.jdk-jar}}
31+
distribution: ${{env.java-distribution}}
3032
- name: Cache Maven packages
3133
uses: actions/cache@v3
3234
with:
@@ -74,9 +76,10 @@ jobs:
7476
steps:
7577
- uses: actions/checkout@v4
7678
- name: Setup JDK ${{env.jdk-jpackage}}
77-
uses: actions/setup-java@v1
79+
uses: actions/setup-java@v5
7880
with:
7981
java-version: ${{env.jdk-jpackage}}
82+
distribution: ${{env.java-distribution}}
8083
- name: Download fat jar
8184
uses: actions/download-artifact@v4
8285
with:
@@ -99,9 +102,10 @@ jobs:
99102
steps:
100103
- uses: actions/checkout@v4
101104
- name: Setup JDK ${{env.jdk-jpackage}}
102-
uses: actions/setup-java@v1
105+
uses: actions/setup-java@v5
103106
with:
104107
java-version: ${{env.jdk-jpackage}}
108+
distribution: ${{env.java-distribution}}
105109
- name: Download fat jar
106110
uses: actions/download-artifact@v4
107111
with:
@@ -124,9 +128,10 @@ jobs:
124128
steps:
125129
- uses: actions/checkout@v4
126130
- name: Setup JDK ${{env.jdk-jpackage}}
127-
uses: actions/setup-java@v1
131+
uses: actions/setup-java@v5
128132
with:
129133
java-version: ${{env.jdk-jpackage}}
134+
distribution: ${{env.java-distribution}}
130135
- name: Download fat jar
131136
uses: actions/download-artifact@v4
132137
with:

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ Otherwise, if you are working in industry on closed-source APIs, we have options
285285
* [Library dependencies for the generated tests](docs/library_dependencies.md)
286286
* [How to contribute](docs/contribute.md)
287287
* [Technical notes for developers contributing to EvoMaster](docs/for_developers.md)
288+
* [Notes for MSc/BSc students doing their theses/projects with EvoMaster](docs/for_msc_bsc_students.md)
288289
* Troubleshooting
289290
* [Windows and networking](docs/troubleshooting/windows.md)
290291
* [java.lang.OutOfMemoryError](docs/troubleshooting/outofmemory.md)

docs/for_msc_bsc_students.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## NOTES FOR MSc/BSc STUDENTS
2+
3+
Welcome to EvoMaster!!!
4+
5+
It is great that you are going to do a MSc/BSc project with EvoMaster.
6+
We wish this is going to be an exciting experience for your professional development and growth.
7+
8+
In this document, let us summarize some practical process aspects of your involvement with EvoMaster:
9+
10+
* You start to work on your own Git _fork_. When your first feature/unit-of-development is ready for a Pull Request (PR), you do a PR towards the main repository of EvoMaster.
11+
12+
* Before making a PR, make sure __all test cases pass__ on your fork's Continuous Integration (CI), i.e., currently GitHub Actions. Also, make sure to pull from latest _master_ branch of EvoMaster before making the PR.
13+
14+
* On GitHub's interfaces, ask for review of your PR to your direct academic supervisor (e.g., Prof. Galeotti if you are studying in Argentina, Dr. Zhang if in China, or Dr. Sahin if in Türkiye). When you fix the comments of your supervisor, and your supervisor approves your PR, your supervisor will ask for review to the current EvoMaster's [benevolent dictator](https://en.wikipedia.org/wiki/Benevolent_dictator_for_life) (i.e., Prof. Arcuri, in Norway).
15+
16+
* A PR from a fork is never going to be merged directly into the _master_ branch. It will first be merged into a new branch. The problem is on how CI is currently setup (long story...). When CI is green on the new branch, it will be merged into _master_.
17+
18+
* When your first PR is merged into _master_, time to celebrate! Thanks for your contribution ;) You will get access to EvoMaster' repository with _write_ rights. From now on, you discard your fork, and work directly in the EvoMaster's repository.
19+
20+
* The _master_ branch of EvoMaster is protected. You cannot directly modify it. You need to work on branches, and then make PRs, using the same process: CI needs to be green before you ask your direct supervisor for review, which will then ask the "dictator" for a second review.
21+
22+
* When making PRs, please remember that _small is beautiful_. If you can divide your work in small separated units that can be reviewed separately, that would be better than a 10k-50k LOCs single PR... also, a feature does not need to be fully completed before some code start to get merged via PRs (as long as CI is green, of course).

0 commit comments

Comments
 (0)