Umstellung auf Open Holiday API und Überarbeitung der Website

.github/workflows/jekyll-gh-pages.yml

@@ -17,46 +17,54 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check:
+  build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.X'
-          cache: 'pip' 
+          python-version: "3.14"
+          cache: pip
+
       - name: Install dependencies
-        run: pip install -r tests/requirements.txt
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tests/requirements.txt
+
+      - name: Generate public holidays ics
+        run: python scripts/03_generate_public_holidays_ics.py
+
+      - name: Generate school holidays ics
+        run: python scripts/03_generate_school_holidays_ics.py
+
+      - name: Generate combined public holidays ics
+        run: python scripts/04_generate_public_holidays_aggregated_ics.py
+
       - name: Run unit tests
         run: pytest
+
+      - name: Generate page
+        run: python scripts/generate_page.py
 
-  build:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.X"
-      - name: Build page
-        run: bash generate_page.sh
-        working-directory: scripts
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
+
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1
         with:
-          source: ./page
+          source: ./website_result
           destination: ./_site
+
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
 
   deploy:
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
@@ -65,4 +73,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/update-holidays.yml

@@ -0,0 +1,121 @@
+name: Update holiday data
+
+on:
+  schedule:
+    - cron: "0 8 * * 3"
+  workflow_dispatch:
+    inputs:
+      close_old_prs:
+        description: Close previously opened automated holiday PRs before creating a new one
+        type: boolean
+        default: true
+        required: true
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+concurrency:
+  group: update-holiday-data
+  cancel-in-progress: false
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tests/requirements.txt
+
+      - name: Fetch public holidays
+        run: python scripts/01_fetch_public_holidays.py
+
+      - name: Fetch school holidays
+        run: python scripts/01_fetch_school_holidays.py
+
+      - name: Merge public holidays
+        run: python scripts/02_merge_public_holidays.py
+
+      - name: Merge school holidays
+        run: python scripts/02_merge_school_holidays.py
+
+      - name: Prepare branch name
+        shell: bash
+        run: |
+          branch_name="update/holidays-$(date -u +%Y-%m-%d)-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          echo "BRANCH_NAME=${branch_name}" >> "$GITHUB_ENV"
+
+      - name: Ensure automated PR label exists
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_LABEL: automated-holiday-update
+        run: |
+          if ! gh label list --json name --jq '.[].name' | grep -Fxq "${PR_LABEL}"; then
+            gh label create "${PR_LABEL}" --color "1d76db" --description "Automated holiday data update PR"
+          fi
+
+      - name: Close old automated PRs
+        if: github.event_name != 'workflow_dispatch' || inputs.close_old_prs
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_LABEL: automated-holiday-update
+        run: |
+          set -euo pipefail
+
+          mapfile -t pr_numbers < <(gh pr list --state open --label "${PR_LABEL}" --json number --jq '.[].number')
+          if [[ ${#pr_numbers[@]} -eq 0 ]]; then
+            echo "No open PRs found with label ${PR_LABEL}"
+            exit 0
+          fi
+
+          for pr_number in "${pr_numbers[@]}"; do
+            echo "Closing PR #${pr_number}"
+            gh pr close "${pr_number}" --delete-branch --comment "Closed automatically by a newer automated holiday update run."
+          done
+
+      - name: Check for data changes
+        id: changes
+        shell: bash
+        run: |
+          if git status --short -- data/public_holidays/raw data/public_holidays/result data/school_holidays/raw data/school_holidays/result | grep -q .; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create pull request
+        if: steps.changes.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v8
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ env.BRANCH_NAME }}
+          base: master
+          title: "Update public and school holidays data"
+          body: Automated update of public and school holiday data.
+          commit-message: "chore: update public and school holidays data"
+          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          labels: automated-holiday-update
+          assignees: Skillkiller
+          sign-commits: true
+          delete-branch: true
+          add-paths: |
+            data/public_holidays/raw/**
+            data/public_holidays/result/**
+            data/school_holidays/raw/**
+            data/school_holidays/result/**

.gitignore

@@ -1 +1,4 @@
-page/
+page/
+Feiertage/
+Ferien/
+website_result/