diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d1103373cb..1219b0b6d7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: - name: Get Composer Cache Directories id: composer-cache run: | - echo "files_cache=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - echo "vcs_cache=$(composer config cache-vcs-dir)" >> $GITHUB_OUTPUT + echo "files_cache=$(composer config cache-files-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT + echo "vcs_cache=$(composer config cache-vcs-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT - name: Generate composer.lock run: | @@ -68,8 +68,8 @@ jobs: - name: Get Composer Cache Directories id: composer-cache run: | - echo "files_cache=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - echo "vcs_cache=$(composer config cache-vcs-dir)" >> $GITHUB_OUTPUT + echo "files_cache=$(composer config cache-files-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT + echo "vcs_cache=$(composer config cache-vcs-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT - name: Generate composer.lock run: composer update --no-install @@ -126,9 +126,10 @@ jobs: matrix: php-version: - "8.0" - - "8.1" - - "8.2" - - "8.3" + #- "8.1" + #- "8.2" + #- "8.3" + - "8.4" count: ${{ fromJson(needs.chunk-matrix.outputs.count) }} chunk: ${{ fromJson(needs.chunk-matrix.outputs.chunks) }} @@ -155,8 +156,9 @@ jobs: - name: Get Composer Cache Directories id: composer-cache run: | - echo "files_cache=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - echo "vcs_cache=$(composer config cache-vcs-dir)" >> $GITHUB_OUTPUT + echo "files_cache=$(composer config cache-files-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT + echo "vcs_cache=$(composer config cache-vcs-dir -q | grep '.cache/composer')" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT - name: Generate composer.lock run: | diff --git a/composer.json b/composer.json index aed943f1dd5..46f2864794d 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-SimpleXML": "*", "ext-ctype": "*", "ext-dom": "*",