Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/reuse-client-components
Browse files Browse the repository at this point in the history
  • Loading branch information
aplr authored Nov 27, 2023
2 parents 4e736fa + bd07c0f commit 4f64438
Show file tree
Hide file tree
Showing 897 changed files with 47,959 additions and 10,544 deletions.
1 change: 1 addition & 0 deletions .ci/E2E-tests/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ docker volume rm $(docker volume ls -q) || true

docker compose -f ./docker/cypress-E2E-tests-mysql.yml down -v
docker compose -f ./docker/cypress-E2E-tests-postgres.yml down -v
docker compose -f ./docker/cypress-E2E-tests-local.yml down -v

# show all running docker containers and volumes after the cleanup to detect issues
echo "SHOW RUNNING Docker containers and volumes:"
Expand Down
2 changes: 2 additions & 0 deletions .ci/E2E-tests/execute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ if [ "$DB" = "mysql" ]; then
COMPOSE_FILE="cypress-E2E-tests-mysql.yml"
elif [ "$DB" = "postgres" ]; then
COMPOSE_FILE="cypress-E2E-tests-postgres.yml"
elif [ "$DB" = "local" ]; then
COMPOSE_FILE="cypress-E2E-tests-local.yml"
else
echo "Invalid database type. Please choose either mysql or postgres."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Compute Tag
uses: actions/github-script@v6
uses: actions/github-script@v7
id: compute-tag
with:
result-encoding: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- name: Process labels
id: process
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest-readyforreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
repo-token: ${{ secrets.GH_TOKEN_ADD_TO_PROJECT }}

- name: Label "ready for review"
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest-unlabeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Get badge id
id: env
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const labelName = context.payload.label.name;
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/testserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Get PR labels
id: get-labels
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Check if latest push had successful build
if: fromJSON(steps.check_build.outputs.data).total_count == 0
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
deploy:${{ matrix.label-identifier }}
- name: Check "lock:${{ matrix.environment }}" label
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
}
- name: Compute Tag
uses: actions/github-script@v6
uses: actions/github-script@v7
id: compute-tag
with:
result-encoding: string
Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
done
- name: Add "lock:${{ matrix.environment }}" label
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,4 @@ data-exports/
!/src/main/resources/config/application-localci.yml
/src/main/resources/id_*
/src/main/resources/known_hosts
/local-ci-scripts
29 changes: 29 additions & 0 deletions .idea/runConfigurations/Artemis_Server_Tests_MySQL.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions .idea/runConfigurations/Artemis_Server_Tests_Postgres.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions .idea/runConfigurations/Artemis__Server__LocalVC___LocalCI_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,3 @@ The folder structure is further divided into:
- service

The tests located in the folder `/app` are not working at the moment and are not included in the test runs.

### Mutation Testing (Server-only)

We (partially) use [PIT Mutation Testing](https://pitest.org/) for mutation testing on server side. It mutates the code to break or modify functionality and re-runs the tests to see if the tests can catch (kill) the mutations by failing. The test quality is assessed by checking the percentage of the mutations killed.

Since there will be multiple mutations and re-runs, it can take significantly longer to execute compared to other server tests.

Location of test files: `src/test/java` (Uses the same files in Server Testing)

Execution command: `./gradlew pitest -x webapp`

The report will be at: `build/reports/pitest/index.html`
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The Artemis development team prioritizes the following issues in the future. We
* **Short term**: Add instructor assistance based on Generative AI
* **Medium term**: Simplify the setup of Artemis
* **Medium term**: Add feedback assistance based on Generative AI
* **Medium term**: Add the possibility to use Iris for questions on all exercise types, lectures, and larning performance aspects
* **Medium term**: Add the possibility to use Iris for questions on all exercise types, lectures, and learning performance aspects
* **Long term**: Microservices, Kubernetes based deployment, and micro frontends
* **Long term**: Allow students to take notes on lecture slides and support the automatic updates of lecture slides
* **Long term**: Develop an exchange platform for exercises
Expand Down Expand Up @@ -95,7 +95,7 @@ Once the PR is ready to merge, notify the responsible feature maintainer:
#### Maintainers

| Feature / Aspect | Maintainer |
|--------------------------------| ----------------------------------------------------------------------------------------------- |
|--------------------------------|-------------------------------------------------------------------------------------------------|
| Programming exercises | [@krusche](https://github.com/krusche) |
| Quiz exercises | [@Santia-go](https://github.com/Santia-go) |
| Modeling exercises (+ Apollon) | [@krusche](https://github.com/krusche) |
Expand All @@ -104,8 +104,8 @@ Once the PR is ready to merge, notify the responsible feature maintainer:
| Exam mode | [@krusche](https://github.com/krusche) |
| Grading | [@maximiliansoelch](https://github.com/maximiliansoelch) |
| Assessment | [@maximiliansoelch](https://github.com/maximiliansoelch) |
| Communication | [@krusche](https://github.com/krusche) |
| Notifications | [@krusche](https://github.com/krusche) |
| Communication | [@rabeatwork](https://github.com/rabeatwork) |
| Notifications | [@rabeatwork](https://github.com/rabeatwork) |
| Team Exercises | [@krusche](https://github.com/krusche) |
| Lectures | [@maximiliansoelch](https://github.com/maximiliansoelch) [@bassner](https://github.com/bassner) |
| Integrated Markdown Editor | [@maximiliansoelch](https://github.com/maximiliansoelch) [@bassner](https://github.com/bassner) |
Expand All @@ -115,7 +115,8 @@ Once the PR is ready to merge, notify the responsible feature maintainer:
| Tutorial Groups | [@Santia-go](https://github.com/Santia-go) |
| Iris | [@bassner](https://github.com/bassner) |
| Scalability | [@mtze](https://github.com/mtze) |
| Usability + Performance | [@bassner](https://github.com/bassner) |
| Usability | [@rabeatwork](https://github.com/rabeatwork) |
| Performance | [@rabeatwork](https://github.com/rabeatwork) |
| Infrastructure | [@mtze](https://github.com/mtze) |
| Mobile apps (iOS + Android) | [@krusche](https://github.com/krusche) [@maximiliansoelch](https://github.com/maximiliansoelch) |

Expand Down
4 changes: 2 additions & 2 deletions artemis-spotless-style.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="21">
<profile kind="CodeFormatterProfile" name="Artemis Spotless Code Style" version="21">
<profiles version="28">
<profile kind="CodeFormatterProfile" name="Artemis Spotless Code Style" version="28">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
Expand Down
Loading

0 comments on commit 4f64438

Please sign in to comment.