From df50033c092bbec39d246d406598445a86e7c1ab Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Fri, 2 Oct 2026 19:25:28 +0200 Subject: [PATCH 1/2] feat(ci): remove audit step --- .github/workflows/ci.yml | 54 +++++--------------------- .github/workflows/static-analysis.yaml | 24 ++---------- composer.json | 5 +++ 3 files changed, 18 insertions(+), 65 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05eb2c24d..d210d50e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,25 +85,14 @@ jobs: - name: Set phpunit/phpunit version constraint run: composer require phpunit/phpunit:'${{ matrix.php.phpunit }}' --dev --no-interaction --no-update - - name: Resolve highest dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit + - name: Install highest dependencies + run: composer update --no-progress --no-interaction --prefer-dist if: ${{ matrix.dependencies == 'highest' }} - - name: Resolve lowest dependencies - run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest --no-install --no-plugins --no-scripts --no-audit + - name: Install lowest dependencies + run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest if: ${{ matrix.dependencies == 'lowest' }} - - name: Audit highest dependencies - run: composer audit --locked --no-interaction --format=table - if: ${{ matrix.dependencies == 'highest' }} - - - name: Audit lowest dependencies - run: composer audit --locked --no-interaction --format=table --abandoned=report - if: ${{ matrix.dependencies == 'lowest' }} - - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts - - name: Run unit tests run: vendor/bin/phpunit --testsuite unit --coverage-clover=coverage.xml # The reason for running some OOM tests without coverage is that because the coverage information collector can cause another OOM event invalidating the test @@ -157,25 +146,14 @@ jobs: - name: Set phpunit/phpunit version constraint run: composer require phpunit/phpunit:'^9.6.34' --dev --no-interaction --no-update - - name: Resolve highest dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - if: ${{ matrix.dependencies == 'highest' }} - - - name: Resolve lowest dependencies - run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest --no-install --no-plugins --no-scripts --no-audit - if: ${{ matrix.dependencies == 'lowest' }} - - - name: Audit highest dependencies - run: composer audit --locked --no-interaction --format=table + - name: Install highest dependencies + run: composer update --no-progress --no-interaction --prefer-dist if: ${{ matrix.dependencies == 'highest' }} - - name: Audit lowest dependencies - run: composer audit --locked --no-interaction --format=table --abandoned=report + - name: Install lowest dependencies + run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest if: ${{ matrix.dependencies == 'lowest' }} - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts - - name: Run OpenTelemetry tests run: vendor/bin/phpunit --testsuite opentelemetry --no-coverage @@ -207,14 +185,8 @@ jobs: key: ${{ runner.os }}-runtime-frankenphp-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-runtime-frankenphp-composer- - - name: Resolve dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - - - name: Audit dependencies - run: composer audit --locked --no-interaction --format=table - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts + run: composer install --no-progress --no-interaction --prefer-dist - name: Install FrankenPHP env: @@ -278,14 +250,8 @@ jobs: key: ${{ runner.os }}-runtime-roadrunner-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-runtime-roadrunner-composer- - - name: Resolve dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - - - name: Audit dependencies - run: composer audit --locked --no-interaction --format=table - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts + run: composer install --no-progress --no-interaction --prefer-dist - name: Install RoadRunner env: diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index ba7c3517c..8bd3e5a5e 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -23,14 +23,8 @@ jobs: with: php-version: '8.4' - - name: Resolve dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - - - name: Audit dependencies - run: composer audit --locked --no-interaction --format=table - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts + run: composer update --no-progress --no-interaction --prefer-dist - name: Run script run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run @@ -47,14 +41,8 @@ jobs: with: php-version: '8.4' - - name: Resolve dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - - - name: Audit dependencies - run: composer audit --locked --no-interaction --format=table - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts + run: composer update --no-progress --no-interaction --prefer-dist - name: Run script run: vendor/bin/phpstan analyse @@ -71,14 +59,8 @@ jobs: with: php-version: '8.4' - - name: Resolve dependencies - run: composer update --no-progress --no-interaction --prefer-dist --no-install --no-plugins --no-scripts --no-audit - - - name: Audit dependencies - run: composer audit --locked --no-interaction --format=table - - name: Install dependencies - run: composer install --no-progress --no-interaction --prefer-dist --no-plugins --no-scripts + run: composer update --no-progress --no-interaction --prefer-dist - name: Run script run: composer mago diff --git a/composer.json b/composer.json index 0d41b44c2..f60a07937 100644 --- a/composer.json +++ b/composer.json @@ -86,6 +86,11 @@ "allow-plugins": { "php-http/discovery": false, "tbachert/spi": false + }, + "policy": { + "advisories": { + "block": false + } } }, "prefer-stable": true From bd779a19242560f44c56520b5e35b949c41d80b3 Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Fri, 2 Oct 2026 19:50:42 +0200 Subject: [PATCH 2/2] fix --- .github/workflows/ci.yml | 2 +- composer.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d210d50e2..09a8b61d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: run: composer remove spiral/roadrunner-http spiral/roadrunner-worker --dev --no-interaction --no-update - name: Remove OpenTelemetry dependencies - run: composer remove open-telemetry/api open-telemetry/context open-telemetry/exporter-otlp open-telemetry/sem-conv open-telemetry/sdk --dev --no-interaction --no-update + run: composer remove open-telemetry/api open-telemetry/context open-telemetry/exporter-otlp open-telemetry/gen-otlp-protobuf open-telemetry/sem-conv open-telemetry/sdk --dev --no-interaction --no-update - name: Set phpunit/phpunit version constraint run: composer require phpunit/phpunit:'${{ matrix.php.phpunit }}' --dev --no-interaction --no-update diff --git a/composer.json b/composer.json index f60a07937..7ed1ac2c6 100644 --- a/composer.json +++ b/composer.json @@ -41,6 +41,7 @@ "open-telemetry/api": "^1.1", "open-telemetry/context": "^1.1", "open-telemetry/exporter-otlp": "^1.1", + "open-telemetry/gen-otlp-protobuf": "^1.2.1", "open-telemetry/sem-conv": "^1.27", "open-telemetry/sdk": "^1.1", "phpstan/phpstan": "^1.3",