From 42d40c0ca7c4d43943d4741d88d7133b8eab0bc6 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 10 Dec 2024 19:40:20 +0100 Subject: [PATCH] dev: Fix the CI configuration --- .github/workflows/linters.yml | 20 ++++++++------------ .github/workflows/tests.yml | 12 +++++------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 8bff31cb..4e35c94e 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -21,9 +21,12 @@ jobs: name: PHP ${{ matrix.php-versions }} CI on ${{ matrix.operating-system }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 with: - submodules: true + node-version: 20 + cache: 'npm' - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -40,22 +43,15 @@ jobs: - name: Get composer cache directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - name: Cache composer dependencies - uses: actions/cache@v2 + - name: Cache Composer dependencies + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- - - name: Cache node dependencies - uses: actions/cache@v2 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: ${{ runner.os }}-node- - - name: Install dependencies run: make install diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9eb06d89..5f6d5676 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,9 +37,7 @@ jobs: name: PHP ${{ matrix.php-versions }} CI on ${{ matrix.operating-system }} steps: - - uses: actions/checkout@v2 - with: - submodules: true + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -56,17 +54,17 @@ jobs: - name: Get composer cache directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - name: Cache composer dependencies - uses: actions/cache@v2 + - name: Cache Composer dependencies + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- - name: Install dependencies - run: composer install + run: make install INSTALLER=composer - name: Setup the application run: make db-setup