From 649534f54feeca46a916a5228e11ab3b7f4eb4b7 Mon Sep 17 00:00:00 2001 From: Huell Date: Tue, 19 Aug 2025 12:41:38 +0200 Subject: [PATCH 01/11] Feat Adjusting workflows --- .../.github => .github}/CODEOWNERS | 0 .../WebEditor/.github => .github}/dependabot.yml | 0 .../workflows/checkFormat.yaml | 1 + .../.github => .github}/workflows/checkLint.yaml | 1 + .../.github => .github}/workflows/main.yml | 2 ++ .../.github => .github}/workflows/pages.yaml | 6 ++++-- .../AnalysisBackendServer/.github/dependabot.yml | 15 --------------- 7 files changed, 8 insertions(+), 17 deletions(-) rename {Backend/AnalysisBackendServer/.github => .github}/CODEOWNERS (100%) rename {Frontend/WebEditor/.github => .github}/dependabot.yml (100%) rename {Frontend/WebEditor/.github => .github}/workflows/checkFormat.yaml (92%) rename {Frontend/WebEditor/.github => .github}/workflows/checkLint.yaml (88%) rename {Backend/AnalysisBackendServer/.github => .github}/workflows/main.yml (94%) rename {Frontend/WebEditor/.github => .github}/workflows/pages.yaml (83%) delete mode 100644 Backend/AnalysisBackendServer/.github/dependabot.yml diff --git a/Backend/AnalysisBackendServer/.github/CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from Backend/AnalysisBackendServer/.github/CODEOWNERS rename to .github/CODEOWNERS diff --git a/Frontend/WebEditor/.github/dependabot.yml b/.github/dependabot.yml similarity index 100% rename from Frontend/WebEditor/.github/dependabot.yml rename to .github/dependabot.yml diff --git a/Frontend/WebEditor/.github/workflows/checkFormat.yaml b/.github/workflows/checkFormat.yaml similarity index 92% rename from Frontend/WebEditor/.github/workflows/checkFormat.yaml rename to .github/workflows/checkFormat.yaml index 89c706ef..83ea0c28 100644 --- a/Frontend/WebEditor/.github/workflows/checkFormat.yaml +++ b/.github/workflows/checkFormat.yaml @@ -16,6 +16,7 @@ jobs: node-version: "22" - name: Install and Lint + working-directory: Frontend/WebEditor run: | npm install npx prettier --check ./**/*.html diff --git a/Frontend/WebEditor/.github/workflows/checkLint.yaml b/.github/workflows/checkLint.yaml similarity index 88% rename from Frontend/WebEditor/.github/workflows/checkLint.yaml rename to .github/workflows/checkLint.yaml index 80fabb14..b91a214f 100644 --- a/Frontend/WebEditor/.github/workflows/checkLint.yaml +++ b/.github/workflows/checkLint.yaml @@ -16,6 +16,7 @@ jobs: node-version: "22" - name: Install and Lint + working-directory: Frontend/WebEditor run: | npm install npm run lint diff --git a/Backend/AnalysisBackendServer/.github/workflows/main.yml b/.github/workflows/main.yml similarity index 94% rename from Backend/AnalysisBackendServer/.github/workflows/main.yml rename to .github/workflows/main.yml index 277ed92c..168d7ec6 100644 --- a/Backend/AnalysisBackendServer/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,7 @@ jobs: if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis' uses: peaceiris/actions-gh-pages@v4 with: + path: Backend/AnalysisBackendServer deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }} external_repository: DataFlowAnalysis/updatesite destination_dir: nightly/analysis-backend-server/ @@ -40,6 +41,7 @@ jobs: if: github.event_name == 'release' && github.repository_owner == 'DataFlowAnalysis' uses: peaceiris/actions-gh-pages@v4 with: + path: Backend/AnalysisBackendServer deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }} external_repository: DataFlowAnalysis/updatesite destination_dir: release/analysis-backend-server/${{ github.event.release.tag_name }} diff --git a/Frontend/WebEditor/.github/workflows/pages.yaml b/.github/workflows/pages.yaml similarity index 83% rename from Frontend/WebEditor/.github/workflows/pages.yaml rename to .github/workflows/pages.yaml index c5b21e84..ac884d54 100644 --- a/Frontend/WebEditor/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -21,17 +21,19 @@ jobs: cache: npm - name: Install dependencies + working-directory: Frontend/WebEditor run: npm install - name: Build project + working-directory: Frontend/WebEditor run: npm run build - name: Upload Pages artifact if: github.ref == 'refs/heads/main' uses: actions/upload-pages-artifact@v3 with: - path: "./dist/" + path: Frontend/WebEditor/dist - name: Deploy to GitHub Pages if: github.ref == 'refs/heads/main' - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/Backend/AnalysisBackendServer/.github/dependabot.yml b/Backend/AnalysisBackendServer/.github/dependabot.yml deleted file mode 100644 index 9a4aad36..00000000 --- a/Backend/AnalysisBackendServer/.github/dependabot.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - day: "sunday" - time: "04:04" - - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "weekly" - day: "sunday" - time: "04:04" From 1e0d1c53514935d1278864c4ad4df15431cb5b42 Mon Sep 17 00:00:00 2001 From: Huell Date: Tue, 19 Aug 2025 12:44:54 +0200 Subject: [PATCH 02/11] Fix workflow directory --- .github/workflows/pages.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index ac884d54..1a164a46 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -15,6 +15,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Use Node.js 20.x + working-directory: Frontend/WebEditor uses: actions/setup-node@v4 with: node-version: 20.x From 8d62bf16dd0892c9a279727bff23838b0aab9b1e Mon Sep 17 00:00:00 2001 From: Huell Date: Sat, 30 Aug 2025 10:43:35 +0200 Subject: [PATCH 03/11] Fix: Dependabot, rename backend Workflow --- .github/dependabot.yml | 14 ++++++++++++++ .../workflows/{main.yml => backendUpdatesite.yml} | 0 2 files changed, 14 insertions(+) rename .github/workflows/{main.yml => backendUpdatesite.yml} (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0df07364..839f7d97 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,6 +13,20 @@ updates: include: "scope" labels: - "dependencies" + - package-ecosystem: "maven" + target-branch: "develop" + directory: "/" + schedule: + interval: "weekly" + day: "wednesday" + time: "11:00" + timezone: "Europe/Berlin" + commit-message: + prefix: "Dependency" + include: "scope" + labels: + - "dependencies" + - "minor" - package-ecosystem: "npm" target-branch: "main" directory: "/" diff --git a/.github/workflows/main.yml b/.github/workflows/backendUpdatesite.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/backendUpdatesite.yml From cf8d8983a66adf1331e54a8a35881b103c9a4892 Mon Sep 17 00:00:00 2001 From: Huell Date: Sat, 30 Aug 2025 10:45:25 +0200 Subject: [PATCH 04/11] Fix dependabot again --- .github/dependabot.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 839f7d97..c8ae490a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,20 +13,6 @@ updates: include: "scope" labels: - "dependencies" - - package-ecosystem: "maven" - target-branch: "develop" - directory: "/" - schedule: - interval: "weekly" - day: "wednesday" - time: "11:00" - timezone: "Europe/Berlin" - commit-message: - prefix: "Dependency" - include: "scope" - labels: - - "dependencies" - - "minor" - package-ecosystem: "npm" target-branch: "main" directory: "/" @@ -40,3 +26,17 @@ updates: include: "scope" labels: - "dependencies" + - package-ecosystem: "maven" + target-branch: "develop" + directory: "/" + schedule: + interval: "weekly" + day: "wednesday" + time: "11:00" + timezone: "Europe/Berlin" + commit-message: + prefix: "Dependency" + include: "scope" + labels: + - "dependencies" + - "minor" From b7782d23113265664263812b9219aaa983330cb1 Mon Sep 17 00:00:00 2001 From: Huell Date: Sat, 30 Aug 2025 10:47:13 +0200 Subject: [PATCH 05/11] Fix: Build workflow directory --- .github/workflows/backendUpdatesite.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/backendUpdatesite.yml b/.github/workflows/backendUpdatesite.yml index 168d7ec6..9783e154 100644 --- a/.github/workflows/backendUpdatesite.yml +++ b/.github/workflows/backendUpdatesite.yml @@ -27,6 +27,8 @@ jobs: maven-version: 3.9.6 - name: Build and Verify run: mvn clean verify + with: + path: Backend/AnalysisBackendServer - name: Publish Nightly Update Site if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis' uses: peaceiris/actions-gh-pages@v4 From f6388bbad077c7ac54e35ecb8889ab4bfeb7371c Mon Sep 17 00:00:00 2001 From: Huell Date: Sat, 30 Aug 2025 10:50:44 +0200 Subject: [PATCH 06/11] Fix updatesite workflow again --- .github/workflows/backendUpdatesite.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/backendUpdatesite.yml b/.github/workflows/backendUpdatesite.yml index 9783e154..25bfa26c 100644 --- a/.github/workflows/backendUpdatesite.yml +++ b/.github/workflows/backendUpdatesite.yml @@ -26,9 +26,8 @@ jobs: with: maven-version: 3.9.6 - name: Build and Verify + working-directory: Backend/AnalysisBackendServer run: mvn clean verify - with: - path: Backend/AnalysisBackendServer - name: Publish Nightly Update Site if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis' uses: peaceiris/actions-gh-pages@v4 From c0ad87a8989ec5404ee725b1fa0b68a116398b9c Mon Sep 17 00:00:00 2001 From: Huell Date: Sat, 30 Aug 2025 10:53:40 +0200 Subject: [PATCH 07/11] Fix: Tabs seem to be illegal --- .github/workflows/backendUpdatesite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backendUpdatesite.yml b/.github/workflows/backendUpdatesite.yml index 25bfa26c..939b2033 100644 --- a/.github/workflows/backendUpdatesite.yml +++ b/.github/workflows/backendUpdatesite.yml @@ -26,7 +26,7 @@ jobs: with: maven-version: 3.9.6 - name: Build and Verify - working-directory: Backend/AnalysisBackendServer + working-directory: Backend/AnalysisBackendServer run: mvn clean verify - name: Publish Nightly Update Site if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis' From 80fda109f4ad91fa705c6efcd1da00cc030a28c9 Mon Sep 17 00:00:00 2001 From: Huell Date: Sun, 31 Aug 2025 11:19:04 +0200 Subject: [PATCH 08/11] Adjust Dependabot directories --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c8ae490a..2dc28f18 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,7 +15,7 @@ updates: - "dependencies" - package-ecosystem: "npm" target-branch: "main" - directory: "/" + directory: "/Frontend/WebEditor" schedule: interval: "weekly" day: "wednesday" @@ -28,7 +28,7 @@ updates: - "dependencies" - package-ecosystem: "maven" target-branch: "develop" - directory: "/" + directory: "/Backend/AnalysisBackendServer" schedule: interval: "weekly" day: "wednesday" From d8aa24123bc8cf07734de571887341f86d6e88d8 Mon Sep 17 00:00:00 2001 From: Huell Date: Sun, 31 Aug 2025 11:22:37 +0200 Subject: [PATCH 09/11] Fix dependabot target branch --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2dc28f18..c0df54bd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,7 +27,7 @@ updates: labels: - "dependencies" - package-ecosystem: "maven" - target-branch: "develop" + target-branch: "main" directory: "/Backend/AnalysisBackendServer" schedule: interval: "weekly" From 868eb5c77c3dcc05a794e8a1799316168db5df26 Mon Sep 17 00:00:00 2001 From: Huell Date: Tue, 2 Sep 2025 01:11:27 +0200 Subject: [PATCH 10/11] Fix Pages yaml --- .github/workflows/pages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 1a164a46..66b1a0ee 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -14,8 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 + - name: Use Node.js 20.x - working-directory: Frontend/WebEditor uses: actions/setup-node@v4 with: node-version: 20.x From 99f2422952fd1e3a67a5393ada61ca04c14ac62c Mon Sep 17 00:00:00 2001 From: Huell Date: Tue, 2 Sep 2025 01:13:31 +0200 Subject: [PATCH 11/11] Fix: cache-dependency-path --- .github/workflows/pages.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 66b1a0ee..b4ce64ee 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -20,6 +20,7 @@ jobs: with: node-version: 20.x cache: npm + cache-dependency-path: Frontend/WebEditor/package-lock.json - name: Install dependencies working-directory: Frontend/WebEditor