From 3f3e9502ff84abe9d1a3b7cd89cef9657403c41a Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 10 May 2026 07:13:19 +0200 Subject: [PATCH] CI: move name-collision job into build.yml --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ .github/workflows/lint-workflows.yml | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b85d0b..48fc4cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -185,3 +185,29 @@ jobs: - name: "PHPStan" run: "make phpstan" + + name-collision: + name: "Name Collision Detector" + + runs-on: "ubuntu-latest" + timeout-minutes: 60 + + steps: + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + with: + egress-policy: audit + + - name: "Checkout" + uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 + + - name: "Install PHP" + uses: "shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1" # v2 + with: + coverage: "none" + php-version: "8.5" + + - uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # v3 + + - name: "Name Collision Detector" + run: "make name-collision" diff --git a/.github/workflows/lint-workflows.yml b/.github/workflows/lint-workflows.yml index 3b38a73..92a5729 100644 --- a/.github/workflows/lint-workflows.yml +++ b/.github/workflows/lint-workflows.yml @@ -111,29 +111,3 @@ jobs: sarif_file: results.sarif category: zizmor wait-for-processing: false - - name-collision: - name: "Name Collision Detector" - - runs-on: "ubuntu-latest" - timeout-minutes: 60 - - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 - with: - egress-policy: audit - - - name: "Checkout" - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - - - name: "Install PHP" - uses: "shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1" # v2 - with: - coverage: "none" - php-version: "8.5" - - - uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # v3 - - - name: "Name Collision Detector" - run: "make name-collision"