Skip to content

Commit 1c194a7

Browse files
authored
Merge branch 'develop' into bugfix/learner-profile-settings
2 parents a60a616 + acbae2a commit 1c194a7

File tree

784 files changed

+18550
-12684
lines changed

Some content is hidden

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

784 files changed

+18550
-12684
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/src/main/java/de/tum/cit/aet/artemis/atlas @ls1intum/atlas-maintainers
1818
/src/main/java/de/tum/cit/aet/artemis/buildagent @ls1intum/programming-maintainers
1919
/src/main/java/de/tum/cit/aet/artemis/communication @ls1intum/communication-maintainers
20+
/src/main/java/de/tum/cit/aet/artemis/hyperion @ls1intum/hyperion-maintainers
2021
/src/main/java/de/tum/cit/aet/artemis/iris @ls1intum/iris-maintainers
2122
/src/main/java/de/tum/cit/aet/artemis/lecture @ls1intum/lectures-maintainers
2223
/src/main/java/de/tum/cit/aet/artemis/lti @ls1intum/lti-maintainers
@@ -31,6 +32,7 @@
3132
/src/main/webapp/app/atlas @ls1intum/atlas-maintainers
3233
/src/main/webapp/app/buildagent @ls1intum/programming-maintainers
3334
/src/main/webapp/app/communication @ls1intum/communication-maintainers
35+
/src/main/webapp/app/hyperion @ls1intum/hyperion-maintainers
3436
/src/main/webapp/app/iris @ls1intum/iris-maintainers
3537
/src/main/webapp/app/lecture @ls1intum/lectures-maintainers
3638
/src/main/webapp/app/lti @ls1intum/lti-maintainers
@@ -44,6 +46,7 @@
4446
/src/test/java/de/tum/cit/aet/artemis/atlas @ls1intum/atlas-maintainers
4547
/src/test/java/de/tum/cit/aet/artemis/buildagent @ls1intum/programming-maintainers
4648
/src/test/java/de/tum/cit/aet/artemis/communication @ls1intum/communication-maintainers
49+
/src/test/java/de/tum/cit/aet/artemis/hyperion @ls1intum/hyperion-maintainers
4750
/src/test/java/de/tum/cit/aet/artemis/iris @ls1intum/iris-maintainers
4851
/src/test/java/de/tum/cit/aet/artemis/lecture @ls1intum/lectures-maintainers
4952
/src/test/java/de/tum/cit/aet/artemis/lti @ls1intum/lti-maintainers

.github/issue-labeler.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ iris:
9191
- \b(?<!\S)ai(?!\S)\b
9292
- caseSensitive: false
9393

94+
hyperion:
95+
- hyperion
96+
- consistency check
97+
- exercise generation
98+
- caseSensitive: false
99+
94100
lecture:
95101
- lecture
96102
- attachment

.github/labeler.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ iris:
104104
- src/test/java/de/tum/cit/aet/artemis/iris/**/*
105105
- src/main/webapp/app/iris/**/*
106106

107+
hyperion:
108+
- changed-files:
109+
- any-glob-to-any-file:
110+
- src/main/java/de/tum/cit/aet/artemis/hyperion/**/*
111+
- src/test/java/de/tum/cit/aet/artemis/hyperion/**/*
112+
- src/main/webapp/app/hyperion/**/*
113+
107114
lecture:
108115
- changed-files:
109116
- any-glob-to-any-file:

.github/workflows/append_feature_proposal.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- id: feature-proposal-tag-check
1414
name: Check if feature proposal tag added
15-
uses: actions/github-script@v7
15+
uses: actions/github-script@v8
1616
with:
1717
github-token: ${{secrets.GITHUB_TOKEN}}
1818
script: |
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Check if feature proposal tag added
43-
uses: actions/github-script@v7
43+
uses: actions/github-script@v8
4444
with:
4545
github-token: ${{secrets.GITHUB_TOKEN}}
4646
script: |
@@ -62,10 +62,10 @@ jobs:
6262
}
6363
6464
- name: Checkout code
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666

6767
- name: Append Feature Proposal Template to Issue Description
68-
uses: actions/github-script@v7
68+
uses: actions/github-script@v8
6969
with:
7070
github-token: ${{secrets.GITHUB_TOKEN}}
7171
script: |
@@ -108,7 +108,7 @@ jobs:
108108
}
109109
110110
- name: Update or Post instructions comment
111-
uses: actions/github-script@v7
111+
uses: actions/github-script@v8
112112
with:
113113
github-token: ${{secrets.GITHUB_TOKEN}}
114114
script: |

.github/workflows/bean-instantiations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Check out code
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: Validate threshold consistency between BeanInstantiationTracer and GitHub Action
2828
shell: bash
@@ -90,7 +90,7 @@ jobs:
9090
echo "✅ All thresholds match between Java file and GitHub Action"
9191
9292
- name: Set up JDK 21
93-
uses: actions/setup-java@v4
93+
uses: actions/setup-java@v5
9494
with:
9595
distribution: temurin
9696
java-version: '21'

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,20 @@ jobs:
9090
name: Build .war artifact
9191
runs-on: ubuntu-latest
9292
steps:
93-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v5
9494
- name: Setup Node.js
95-
uses: actions/setup-node@v4
95+
uses: actions/setup-node@v5
9696
with:
9797
node-version: '${{ env.node }}'
9898
cache: 'npm'
9999
- name: Setup Java
100-
uses: actions/setup-java@v4
100+
uses: actions/setup-java@v5
101101
with:
102102
distribution: 'temurin'
103103
java-version: '${{ env.java }}'
104104
cache: 'gradle'
105105
- name: Setup Gradle
106-
uses: gradle/actions/setup-gradle@v3
106+
uses: gradle/actions/setup-gradle@v4
107107
- name: Production Build
108108
run: ./gradlew -Pprod -Pwar clean bootWar
109109
- name: Upload Artifact
@@ -125,7 +125,7 @@ jobs:
125125
docker:
126126
name: Build and Push Docker Image
127127
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'ls1intum/Artemis' }}
128-
uses: ls1intum/.github/.github/workflows/[email protected].0
128+
uses: ls1intum/.github/.github/workflows/[email protected].1
129129
with:
130130
# Checkout pull request HEAD commit instead of merge commit to include the correct branch and git information inside the build
131131
# Or use the push event ref name

.github/workflows/check-aeolus-scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Check if windfiles and scripts match
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
2020
- name: Check if windfiles and scripts match

.github/workflows/check-translation-keys.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: Check if translation keys are consistent
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: actions/setup-python@v5
16+
- uses: actions/checkout@v5
17+
- uses: actions/setup-python@v6
1818
with:
1919
python-version: "3.13"
2020
- name: Check if translation keys match

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545

4646
# Install Java 21
4747
- name: Setup Node.js
48-
uses: actions/setup-node@v4
48+
uses: actions/setup-node@v5
4949
with:
5050
node-version: '${{ env.node }}'
5151
cache: 'npm'
5252
- name: Setup Java
53-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
5454
with:
5555
distribution: 'temurin'
5656
java-version: '${{ env.java }}'

.github/workflows/docs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
check-python-version:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Install yq
2222
run: |
2323
sudo apt-get update
@@ -32,7 +32,7 @@ jobs:
3232
- name: Extract Python version from workflow file
3333
id: extract_workflow_version
3434
run: |
35-
workflow_version=$(cat .github/workflows/docs.yml | yq '.jobs.docs.steps[] | select(.uses == "actions/setup-python@v5") | .with."python-version"' | tr -d '"')
35+
workflow_version=$(cat .github/workflows/docs.yml | yq '.jobs.docs.steps[] | select(.uses == "actions/setup-python@v6") | .with."python-version"' | tr -d '"')
3636
echo "workflow_version=$workflow_version" >> $GITHUB_OUTPUT
3737
- name: Validate Python versions match
3838
run: |
@@ -46,8 +46,8 @@ jobs:
4646
needs: check-python-version
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v4
50-
- uses: actions/setup-python@v5
49+
- uses: actions/checkout@v5
50+
- uses: actions/setup-python@v6
5151
with:
5252
# keep in sync with Python version in docs/.readthedocs.yaml
5353
python-version: "3.13"
@@ -71,7 +71,7 @@ jobs:
7171
needs: docs
7272
steps:
7373
- name: Download artifact
74-
uses: actions/download-artifact@v4
74+
uses: actions/download-artifact@v5
7575
with:
7676
name: documentation
7777
path: public

0 commit comments

Comments
 (0)