From f6b0f864b481d672181fc4756d218494ce0d46eb Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Sat, 7 Mar 2026 23:30:32 +0200 Subject: [PATCH] fix: workflows now use .php-version, other fixes (#98) * ci: use .php-version file in CI coverage and security jobs * ci: use .php-version file in release workflow * ci: use .php-version file in phpcs workflow * ci: use .php-version file in test-coverage workflow * ci: remove master branch from pr-lint workflow triggers --- .github/workflows/ci.yml | 12 +++++------ .github/workflows/phpcs.yaml | 2 +- .github/workflows/pr-lint.yml | 4 ++-- .github/workflows/release.yml | 31 ++++++++-------------------- .github/workflows/test-coverage.yaml | 2 +- 5 files changed, 19 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60b3aa5..e92a994 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + run: composer install --prefer-dist --no-progress - name: Run PHPUnit tests run: composer test @@ -71,16 +71,16 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: - php-version: "8.4" + php-version-file: '.php-version' extensions: mbstring, xml, ctype, iconv, intl, json tools: composer:v2 coverage: xdebug - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + run: composer install --prefer-dist --no-progress - name: Run tests with coverage - run: composer test:coverage + run: composer test:ci - name: Upload coverage reports to Codecov uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2 @@ -100,12 +100,12 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: - php-version: "8.4" + php-version-file: '.php-version' extensions: mbstring, xml, ctype, iconv, intl, json tools: composer:v2 - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + run: composer install --prefer-dist --no-progress - name: Run security audit run: composer audit diff --git a/.github/workflows/phpcs.yaml b/.github/workflows/phpcs.yaml index 0e6e195..eaed20b 100644 --- a/.github/workflows/phpcs.yaml +++ b/.github/workflows/phpcs.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: - php-version: "8.4" + php-version-file: '.php-version' - name: Install dependencies run: composer install --no-interaction --prefer-dist - name: Run PHP_CodeSniffer (PSR-12) diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 915780a..5d77161 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -4,9 +4,9 @@ name: Lint Code Base on: push: - branches: [master, main] + branches: [main] pull_request: - branches: [master, main] + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 223c030..d6a6498 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,12 +24,12 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: - php-version: "8.4" + php-version-file: '.php-version' extensions: mbstring, xml, ctype, iconv, intl, json tools: composer:v2 - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest --no-dev --optimize-autoloader + run: composer install --prefer-dist --no-progress --optimize-autoloader - name: Run tests run: composer test @@ -59,29 +59,16 @@ jobs: echo "content=Release ${{ steps.tag.outputs.name }}" >> $GITHUB_OUTPUT fi - - name: Create Release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 - id: create_release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.tag.outputs.name }} - release_name: ${{ steps.tag.outputs.name }} - body: ${{ steps.changelog.outputs.content }} - draft: false - prerelease: ${{ contains(steps.tag.outputs.name, '-') }} - - name: Archive source code run: | mkdir -p release composer archive --format=zip --dir=release --file=monolog-gdpr-filter-${{ steps.tag.outputs.name }} - - name: Upload release asset - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release + uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0 with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./release/monolog-gdpr-filter-${{ steps.tag.outputs.name }}.zip - asset_name: monolog-gdpr-filter-${{ steps.tag.outputs.name }}.zip - asset_content_type: application/zip + name: ${{ steps.tag.outputs.name }} + body: ${{ steps.changelog.outputs.content }} + draft: false + prerelease: ${{ contains(steps.tag.outputs.name, '-') }} + files: ./release/monolog-gdpr-filter-${{ steps.tag.outputs.name }}.zip diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 87cf2af..851544b 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -25,7 +25,7 @@ jobs: uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0 with: coverage: pcov - php-version: "8.4" + php-version-file: '.php-version' - name: Install dependencies run: composer install --no-interaction --prefer-dist