From d5d3fecae8274ca86549a472f03dc7aa2cf4b655 Mon Sep 17 00:00:00 2001
From: thePanz <thepanz@gmail.com>
Date: Thu, 16 Nov 2023 23:07:26 +0100
Subject: [PATCH] Update(github) Update github workflows, include cache for
 composer install

---
 .editorconfig                                |  4 +
 .github/workflows/continuous-integration.yml | 95 +++++++++++---------
 .github/workflows/lint.yml                   | 14 +--
 3 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 779f99a12..92af3f94c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,7 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[.github/**.yml]
+indent_size = 2
+indent_style = space
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index b27f75493..d7b2244d1 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -1,49 +1,60 @@
 name: "Continuous Integration"
 
 on:
-    push:
-      branches:
-        - master
-    pull_request:
+  push:
+    branches:
+      - master
+  pull_request:
 
 env:
-    fail-fast: true
+  fail-fast: true
 
 jobs:
-    tests:
-        name: "Symfony1 Tests"
-        runs-on: "ubuntu-22.04"
-
-        strategy:
-            matrix:
-                php-version:
-                    - "7.4"
-                    - "8.0"
-                    - "8.1"
-                    - "8.2"
-                memcached-version:
-                    - "1.6"
-
-        services:
-            memcached:
-              image: "memcached:${{ matrix.memcached-version }}"
-
-        steps:
-            - name: "Checkout"
-              uses: "actions/checkout@v3"
-              with:
-                submodules: "true"
-
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
-              with:
-                  php-version: "${{ matrix.php-version }}"
-
-            - name: "Install dependencies with Composer"
-              uses: "ramsey/composer-install@v2"
-
-            - name: "Run Check configuration"
-              run: "php data/bin/check_configuration.php"
-
-            - name: "Run Tests"
-              run: "php data/bin/symfony symfony:test --trace"
+  tests:
+    name: "Symfony1 Tests"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+          - "8.2"
+        memcached-version:
+          - "1.6"
+
+    services:
+      memcached:
+        image: "memcached:${{ matrix.memcached-version }}"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3"
+        with:
+          submodules: "true"
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist
+
+      - name: Run Check configuration
+        run: php data/bin/check_configuration.php
+
+      - name: Run Tests
+        run: php data/bin/symfony symfony:test --trace
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3f797cef8..d2bf54b71 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,22 +10,22 @@ jobs:
     name: 'PHP-CS-Fixer'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: actions/checkout@v3
 
-      - name: 'Setup PHP'
-        uses: 'shivammathur/setup-php@v2'
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: 8.1
           tools: php-cs-fixer, cs2pr
 
-      - uses: 'actions/cache@v3'
+      - uses: actions/cache@v3
         with:
           path: '.php-cs-fixer.cache'
-          key: '${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}'
+          key: ${{ github.repository }}-8.1-phpcsfixer-${{ github.ref_name }}
           restore-keys: |
             ${{ github.repository }}-8.1-phpcsfixer-main
             ${{ github.repository }}-8.1-phpcsfixer-
 
-      - name: 'Run PHP-CS-Fixer'
+      - name: Run PHP-CS-Fixer
         # Using cs2pr settings, see: https://github.com/shivammathur/setup-php#tools-with-checkstyle-support
         run: 'php-cs-fixer fix --dry-run --format checkstyle | cs2pr'