From 0838dbc41f7820b3af3de525231c5935c30fc66d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:47:28 +0000 Subject: [PATCH 1/4] gh-actions(deps): Bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 71830b12..cda3f6c3 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -136,7 +136,7 @@ jobs: steps: - name: fetch test artifacts # see https://github.com/actions/download-artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.TESTS_REPORTS_ARTIFACT }} path: ${{ env.REPORTS_DIR }} From 91c8bb4f92b792c5c37113d71757c44b5f31971c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 20:47:31 +0000 Subject: [PATCH 2/4] gh-actions(deps): Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 71830b12..a836f0e6 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -123,7 +123,7 @@ jobs: - name: Artifact reports if: ${{ ! cancelled() }} # see https://github.com/actions/upload-artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.TESTS_REPORTS_ARTIFACT }} path: ${{ env.REPORTS_DIR }} @@ -223,7 +223,7 @@ jobs: - name: Artifact reports if: ${{ ! cancelled() }} # see https://github.com/actions/upload-artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.TYPES_REPORTS_ARTIFACT }} path: ${{ env.REPORTS_DIR }} From 00b39802af8445c37df19b905e874dc34499ddcc Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 30 Apr 2024 12:13:05 +0200 Subject: [PATCH 3/4] migrate Signed-off-by: Jan Kowalleck --- .github/workflows/php.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 38b99f8f..0ff7caef 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -125,7 +125,7 @@ jobs: # see https://github.com/actions/upload-artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.TESTS_REPORTS_ARTIFACT }} + name: ${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_${{ matrix.os }}_php${{ matrix.php }}_${{ matrix.dependencies }} path: ${{ env.REPORTS_DIR }} if-no-files-found: error report-coverage: @@ -138,7 +138,8 @@ jobs: # see https://github.com/actions/download-artifact uses: actions/download-artifact@v4 with: - name: ${{ env.TESTS_REPORTS_ARTIFACT }} + pattern: ${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_* + merge-multiple: true path: ${{ env.REPORTS_DIR }} - name: Run codacy-coverage-reporter env: @@ -225,7 +226,7 @@ jobs: # see https://github.com/actions/upload-artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.TYPES_REPORTS_ARTIFACT }} + name: ${{ env.TYPES_REPORTS_ARTIFACT }}_psalm_php${{ matrix.php }}_${{ matrix.dependencies }} path: ${{ env.REPORTS_DIR }} if-no-files-found: error composer-unused: From c0ba13a1d672a63d7c0908372119fef33c3e5a6d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 30 Apr 2024 12:20:38 +0200 Subject: [PATCH 4/4] migrate Signed-off-by: Jan Kowalleck --- .github/workflows/php-dev.yml | 2 +- .github/workflows/php.yml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/php-dev.yml b/.github/workflows/php-dev.yml index b1bb37b8..05e2b423 100644 --- a/.github/workflows/php-dev.yml +++ b/.github/workflows/php-dev.yml @@ -21,7 +21,7 @@ on: - cron: '42 23 * * 5' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: '${{ github.workflow }}-${{ github.ref }}' cancel-in-progress: true env: diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 0ff7caef..d06cfea7 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -13,7 +13,7 @@ on: - cron: '42 23 * * 5' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: '${{ github.workflow }}-${{ github.ref }}' cancel-in-progress: true env: @@ -43,7 +43,7 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate --no-interaction phpunit: - name: PHPUnit (${{ matrix.os}}, ${{ matrix.php }}, ${{ matrix.dependencies }}) + name: PHPUnit (${{ matrix.os}}, php${{ matrix.php }}, ${{ matrix.dependencies }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -125,7 +125,7 @@ jobs: # see https://github.com/actions/upload-artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_${{ matrix.os }}_php${{ matrix.php }}_${{ matrix.dependencies }} + name: '${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_${{ matrix.os }}_php${{ matrix.php }}_${{ matrix.dependencies }}' path: ${{ env.REPORTS_DIR }} if-no-files-found: error report-coverage: @@ -138,13 +138,14 @@ jobs: # see https://github.com/actions/download-artifact uses: actions/download-artifact@v4 with: - pattern: ${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_* + pattern: '${{ env.TESTS_REPORTS_ARTIFACT }}_phpunit_*' merge-multiple: true path: ${{ env.REPORTS_DIR }} - name: Run codacy-coverage-reporter env: CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} - if: ${{ env.CODACY_PROJECT_TOKEN != '' }} ## see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-secrets + ## see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-secrets + if: ${{ env.CODACY_PROJECT_TOKEN != '' }} # see https://github.com/codacy/codacy-coverage-reporter-action uses: codacy/codacy-coverage-reporter-action@v1 with: @@ -219,14 +220,14 @@ jobs: --no-cache --long-progress --php-version='${{ matrix.php }}' - --report='${{ env.REPORTS_DIR }}/psalm/php${{ matrix.php }}_${{ matrix.dependencies }}.junit.xml' + --report='${{ env.REPORTS_DIR }}/psalm/p${{ matrix.php }}_c${{ matrix.composer }}_${{ matrix.dependencies }}.junit.xml' --stats - name: Artifact reports if: ${{ ! cancelled() }} # see https://github.com/actions/upload-artifact uses: actions/upload-artifact@v4 with: - name: ${{ env.TYPES_REPORTS_ARTIFACT }}_psalm_php${{ matrix.php }}_${{ matrix.dependencies }} + name: '${{ env.TYPES_REPORTS_ARTIFACT }}_psalm_p${{ matrix.php }}_c${{ matrix.composer }}_${{ matrix.dependencies }}' path: ${{ env.REPORTS_DIR }} if-no-files-found: error composer-unused: