Skip to content

Commit

Permalink
Merge branch 'develop' into chore/update-ngxgraph
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Jan 4, 2025
2 parents a03e63f + 4e56238 commit b54236e
Show file tree
Hide file tree
Showing 1,204 changed files with 21,351 additions and 29,052 deletions.
1 change: 0 additions & 1 deletion .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ programming:
- build plan
- code hint
- \b(?<!\S)git(?!\S)\b
- testwise coverage
- \b(?<!\S)ide(?!\S)\b
- submission policy
- aeolus
Expand Down
117 changes: 0 additions & 117 deletions .github/workflows/analysis-of-endpoint-connections.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
# Keep in sync with codeql-analysis.yml and test.yml and analysis-of-endpoint-connections.yml
env:
CI: true
node: 20
node: 22
java: 21
RAW_URL: https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
# Keep in sync with build.yml and test.yml and analysis-of-endpoint-connections.yml
env:
CI: true
node: 20
node: 22
java: 21


Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ concurrency:
# Keep in sync with codeql-analysis.yml and build.yml
env:
CI: true
node: 20
node: 22
java: 21

jobs:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/testserver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,13 @@ jobs:
folder: /opt/artemis
host_keys: |
#- environment: artemis-test7.artemis.cit.tum.de
# label-identifier: artemis-test7
# url: https://artemis-test7.artemis.cit.tum.de
# user: deployment
# hosts: artemis-test7.artemis.cit.tum.de
# folder: /opt/artemis
- environment: artemis-test7.artemis.cit.tum.de
label-identifier: artemis-test7
url: https://artemis-test7.artemis.cit.tum.de
user: deployment
hosts: artemis-test7.artemis.cit.tum.de
folder: /opt/artemis
host_keys: |
#- environment: artemis-test8.artemis.cit.tum.de
# label-identifier: artemis-test8
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ data-exports/
######################
/src/test/playwright/test-reports/
/src/test/playwright/test-results/*
/src/test/playwright/ssh-keys/known_hosts

#################################
# Files generated by prebuild.mjs
Expand All @@ -219,4 +220,3 @@ data-exports/
# Supporting scripts config
##############################
/supporting_scripts/**/*.ini
/supporting_scripts/analysis-of-endpoint-connections/build/**/*
11 changes: 5 additions & 6 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.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 TUM Applied Software Engineering
Copyright (c) 2025 TUM Applied Education Technologies

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):

```shell
./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.7.4.war
./artemis-server-cli deploy username@artemis-test0.artemis.in.tum.de -w build/libs/Artemis-7.8.1.war
```

## Architecture
Expand Down
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"packageManager": "npm",
"cache": {
"enabled": true,
"path": ".cache",
"path": "./build/angular/",
"environment": "all"
},
"schematicCollections": [
Expand Down
Loading

0 comments on commit b54236e

Please sign in to comment.