From 36c55fc49ebbcd26238ab1b7ed3b6aa7892177b8 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:16:55 +0900 Subject: [PATCH 1/3] Bump php version from 8.4-rc to 8.4 --- .github/workflows/dockerbuild-and-push.yml | 2 +- .github/workflows/dockerbuild.yml | 2 +- .github/workflows/e2e-tests.yml | 4 ++-- .github/workflows/unit-tests.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dockerbuild-and-push.yml b/.github/workflows/dockerbuild-and-push.yml index 125683f27b..c6811c25bf 100644 --- a/.github/workflows/dockerbuild-and-push.yml +++ b/.github/workflows/dockerbuild-and-push.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] steps: - name: downcase REPO diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index d2d4ec2a42..062237369a 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] steps: - name: Checkout diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 1a114efb30..1d464a38a5 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -30,7 +30,7 @@ jobs: - 'test/front_login' - 'test/front_guest' - 'test/admin' - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] db: [ mysql, pgsql ] steps: - name: Checkout @@ -127,7 +127,7 @@ jobs: fail-fast: false matrix: db: [ 'pgsql', 'mysql' ] - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] include: - db: mysql dbport: '3306' diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 89b0a2a465..6d6867b8dc 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: operating-system: [ ubuntu-22.04 ] - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] db: [ mysql, pgsql ] steps: From 231c6b2054a717f37b729c920182cfa8cb320127 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:52:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?php-cs-fixer=20fix=20--diff=20--dry-run=20-?= =?UTF-8?q?-allow-risky=3Dyes=20=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit see https://github.com/EC-CUBE/ec-cube2/issues/1025 --- .github/workflows/main.yml | 14 ++++++-- .github/workflows/php-cs-fixer.yml | 53 ++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/php-cs-fixer.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e80a786676..8dbf6e157e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,13 +18,21 @@ jobs: with: event_name: ${{ github.event_name }} uses: ./.github/workflows/dockerbuild.yml - phpstan: + php-cs-fixer: with: ref_name: ${{ github.ref_name }} base_ref: ${{ github.base_ref }} event_name: ${{ github.event_name }} owner: ${{ github.repository_owner }} needs: [ dockerbuild ] + uses: ./.github/workflows/php-cs-fixer.yml + phpstan: + with: + ref_name: ${{ github.ref_name }} + base_ref: ${{ github.base_ref }} + event_name: ${{ github.event_name }} + owner: ${{ github.repository_owner }} + needs: [ php-cs-fixer ] uses: ./.github/workflows/phpstan.yml unit-tests: with: @@ -32,7 +40,7 @@ jobs: base_ref: ${{ github.base_ref }} event_name: ${{ github.event_name }} owner: ${{ github.repository_owner }} - needs: [ dockerbuild ] + needs: [ php-cs-fixer ] uses: ./.github/workflows/unit-tests.yml e2e-tests: with: @@ -40,7 +48,7 @@ jobs: base_ref: ${{ github.base_ref }} event_name: ${{ github.event_name }} owner: ${{ github.repository_owner }} - needs: [ dockerbuild ] + needs: [ php-cs-fixer ] uses: ./.github/workflows/e2e-tests.yml success: needs: diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml new file mode 100644 index 0000000000..c0ec27ed8d --- /dev/null +++ b/.github/workflows/php-cs-fixer.yml @@ -0,0 +1,53 @@ +name: php-cs-fixer dry-run +run-name: php-cs-fixer + +on: + workflow_call: + inputs: + ref_name: + required: false + type: string + base_ref: + required: false + type: string + event_name: + required: true + type: string + owner: + required: true + type: string +jobs: + php-cs-fixer: + name: php-cs-fixer + runs-on: ubuntu-latest + steps: + - name: "Checkout" + uses: actions/checkout@v4 + + - name: Build docker image + uses: ./.github/actions/dockerbuild + with: + php-version: '8.4' + + - name: Setup environment + env: + REF_NAME: ${{ inputs.ref_name }} + BASE_REF: ${{ inputs.base_ref }} + EVENT_NAME: ${{ inputs.event_name }} + OWNER: ${{ inputs.owner }} + run: | + echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.dev.yml" >> $GITHUB_ENV + echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV + if [ $EVENT_NAME = "pull_request" ]; then + if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then + echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV + else + echo "TAG=8.3-apache-${BASE_REF}" >> $GITHUB_ENV + fi + else + echo "TAG=8.3-apache-${REF_NAME}" >> $GITHUB_ENV + fi + - run: | + docker compose up -d --wait + docker compose exec -T ec-cube composer install + - run: docker compose exec -T ec-cube php data/vendor/bin/php-cs-fixer fix --diff --dry-run --allow-risky=yes From d446346a25e9a9411feffee7a2084758dfb371b1 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 9 Dec 2024 00:59:57 +0900 Subject: [PATCH 3/3] Add `PHP_CS_FIXER_IGNORE_ENV=1` --- .github/workflows/php-cs-fixer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml index c0ec27ed8d..8cdacb0c8a 100644 --- a/.github/workflows/php-cs-fixer.yml +++ b/.github/workflows/php-cs-fixer.yml @@ -42,12 +42,12 @@ jobs: if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV else - echo "TAG=8.3-apache-${BASE_REF}" >> $GITHUB_ENV + echo "TAG=8.4-apache-${BASE_REF}" >> $GITHUB_ENV fi else - echo "TAG=8.3-apache-${REF_NAME}" >> $GITHUB_ENV + echo "TAG=8.4-apache-${REF_NAME}" >> $GITHUB_ENV fi - run: | docker compose up -d --wait docker compose exec -T ec-cube composer install - - run: docker compose exec -T ec-cube php data/vendor/bin/php-cs-fixer fix --diff --dry-run --allow-risky=yes + - run: docker compose exec -T -e PHP_CS_FIXER_IGNORE_ENV=1 ec-cube php data/vendor/bin/php-cs-fixer fix --diff --dry-run --allow-risky=yes