From 0a0826fe7a8a12d121959570dd48cbb0d86ade25 Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@outlook.com>
Date: Wed, 16 Oct 2024 13:45:31 +0200
Subject: [PATCH] [TASK] Update CI

---
 .github/workflows/ci.yml | 51 +++++++++++++++++++++++++++++++++-------
 Build/package-lock.json  |  1 -
 Build/package.json       |  1 -
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 357851b..6536ab9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,26 +9,52 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        typo3: ['^12', '^13', '13.4.x-dev']
+        php: ['8.2', '8.3']
+        include:
+          - typo3: '^12'
+            php: '8.1'
     steps:
+
       - id: checkout
         name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - id: setup_php
         name: Set up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           tools: composer:v2
+
+      - name: Composer Cache Vars
+        id: composer-cache-vars
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+          echo "timestamp=$(date +"%s")" >> $GITHUB_OUTPUT
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache-vars.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.typo3 }}-${{ steps.composer-cache-vars.outputs.timestamp }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.typo3 }}-
+            ${{ runner.os }}-composer-${{ matrix.php }}-
+            ${{ runner.os }}-composer-
+
       - id: install
         name: Install
         run: |
-          composer install --no-progress
+          composer require typo3/cms-core:${{ matrix.typo3 }} --no-progress
+          git checkout composer.json
+
       - id: lint
         name: Lint
         if: ${{ always() && steps.install.conclusion == 'success' }}
         run: |
           composer test:php:lint
+
       - id: cgl
         name: CGL
         if: ${{ always() && steps.install.conclusion == 'success' }}
@@ -39,22 +65,29 @@ jobs:
     name: Build Frontend
     runs-on: ubuntu-latest
     steps:
+
       - id: checkout
         name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - id: setup_node
         name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
-      - name: Install
+          node-version: 20
+
+      - id: install
+        name: Install
         run: |
           cd Build
-          npm ci
-      - name: Build
+          npm install
+
+      - id: build
+        name: Build
         run: |
           cd Build
           npm run build
+
       - name: Status
         run: |
           git status
diff --git a/Build/package-lock.json b/Build/package-lock.json
index 45bf5b4..d30c361 100644
--- a/Build/package-lock.json
+++ b/Build/package-lock.json
@@ -6,7 +6,6 @@
     "packages": {
         "": {
             "name": "bk2k-syntax",
-            "version": "2.0.1",
             "license": "GPL-2.0-or-later",
             "devDependencies": {
                 "grunt": "^1.6.1",
diff --git a/Build/package.json b/Build/package.json
index 59155db..f5ebd82 100644
--- a/Build/package.json
+++ b/Build/package.json
@@ -5,7 +5,6 @@
     "readme": "../README.md",
     "homepage": "http://www.bk2k.info",
     "author": "Benjamin Kott",
-    "version": "3.0.0",
     "license": "GPL-2.0-or-later",
     "devDependencies": {
         "grunt": "^1.6.1",