From c6e92daa640e972040dccdbbdb06087ecf63e63a Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Fri, 17 May 2024 11:19:41 +0200 Subject: [PATCH] Fettling. --- .github/workflows/test.yml | 6 +++--- .trunk/trunk.yaml | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5df09eb..c0bdb1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: name: PHP-CS-Fixer runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: PHP-CS-Fixer uses: docker://oskarstark/php-cs-fixer-ga @@ -30,7 +30,7 @@ jobs: name: PHPUnit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: php-actions/composer@v6 - uses: php-actions/phpunit@v3 @@ -38,7 +38,7 @@ jobs: name: PHPStan runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: php-actions/composer@v6 - uses: php-actions/phpstan@v3 with: diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index e98156c..2035a9b 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -17,6 +17,10 @@ runtimes: - python@3.10.8 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration) lint: + disabled: + - trufflehog # Trufflehog duplicates gitleaks functionality. + - terrascan + - trivy enabled: - gitleaks@8.18.2 - markdownlint@0.40.0 @@ -25,8 +29,6 @@ lint: - checkov@3.2.92 - git-diff-check - prettier@3.2.5 - - trivy@0.51.1 - - trufflehog@3.76.2 - yamllint@1.35.1 definitions: - name: markdownlint