From 62d02f08f3f77aac745f5be07b16f753e4a10737 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Wed, 11 Dec 2024 20:22:26 +0100 Subject: [PATCH 1/2] Update actions dependencies to latest version --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2e286ac..39de42f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -37,7 +37,7 @@ jobs: run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT shell: bash - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} From f585e98796f0d3376b4f6dea02fba46200196399 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Wed, 11 Dec 2024 21:34:23 +0100 Subject: [PATCH 2/2] TASK: Checkout code with same branch name as target version to fulfill dependencies of distribution --- .github/workflows/tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 39de42f..acbbcca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,6 +11,7 @@ jobs: build: env: FLOW_PATH_ROOT: ../neos-base-distribution + PACKAGE_FOLDER: neos-seo runs-on: ubuntu-latest @@ -27,6 +28,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Set package branch name + run: echo "PACKAGE_TARGET_VERSION=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV + working-directory: . + - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -48,7 +53,9 @@ jobs: git clone --depth 1 --branch ${{ matrix.neos-version }} https://github.com/neos/neos-development-distribution.git ${FLOW_PATH_ROOT} cd ${FLOW_PATH_ROOT} composer config --no-plugins allow-plugins.neos/composer-plugin true - composer config repositories.package '{ "type": "path", "url": "../neos-seo", "options": { "symlink": false } }' + + git -C ../${{ env.PACKAGE_FOLDER }} checkout -b ${PACKAGE_TARGET_VERSION} + composer config repositories.package '{ "type": "path", "url": "../${{ env.PACKAGE_FOLDER }}", "options": { "symlink": false } }' composer require --no-update --no-interaction neos/seo:@dev composer require --dev --no-update --no-interaction phpstan/phpstan:^1.10