diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 455760a4..c6a7b337 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,11 @@ -# https://help.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#target-branch +# https://help.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates version: 2 updates: - commit-message: include: "scope" - prefix: "Build" + prefix: "composer" directory: "/" labels: - "dependency" @@ -13,10 +13,11 @@ updates: package-ecosystem: "composer" schedule: interval: "daily" + versioning-strategy: "increase" - commit-message: include: "scope" - prefix: "Build" + prefix: "github-actions" directory: "/" labels: - "dependency" diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 800f7d21..80ba7502 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy env: MIN_COVERED_MSI: 95 MIN_MSI: 95 - REQUIRED_PHP_EXTENSIONS: "mbstring" + PHP_EXTENSIONS: "mbstring" jobs: coding-standards: @@ -29,7 +29,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Lint YAML files" uses: "ibiqlik/action-yamllint@v1" @@ -42,7 +42,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}" + extensions: "${{ env.PHP_EXTENSIONS }}" php-version: "${{ matrix.php-version }}" - name: "Validate composer.json and composer.lock" @@ -105,13 +105,13 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" with: coverage: "none" - extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}" + extensions: "${{ env.PHP_EXTENSIONS }}" php-version: "${{ matrix.php-version }}" - name: "Determine composer cache directory" @@ -157,13 +157,13 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" with: coverage: "none" - extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}" + extensions: "${{ env.PHP_EXTENSIONS }}" php-version: "${{ matrix.php-version }}" - name: "Determine composer cache directory" @@ -235,13 +235,13 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" with: coverage: "none" - extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}" + extensions: "${{ env.PHP_EXTENSIONS }}" php-version: "${{ matrix.php-version }}" - name: "Determine composer cache directory" @@ -291,7 +291,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" @@ -349,7 +349,7 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" @@ -404,7 +404,8 @@ jobs: github.event.action == 'reopened' || github.event.action == 'synchronize' ) && ( - (github.actor == 'dependabot[bot]' && startsWith(github.event.pull_request.title, 'Build(deps-dev)')) || + (github.actor == 'dependabot[bot]' && startsWith(github.event.pull_request.title, 'composer(deps-dev)')) || + (github.actor == 'dependabot[bot]' && startsWith(github.event.pull_request.title, 'github-actions(deps)')) || (github.actor == 'ergebnis-bot' && github.event.pull_request.title == 'Enhancement: Update license year') || (github.actor == 'localheinz' && contains(github.event.pull_request.labels.*.name, 'merge')) ) diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index a3ab9812..0d478096 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -7,7 +7,7 @@ on: # yamllint disable-line rule:truthy - cron: "1 0 1 1 *" env: - REQUIRED_PHP_EXTENSIONS: "mbstring" + PHP_EXTENSIONS: "mbstring" jobs: license: @@ -25,13 +25,13 @@ jobs: steps: - name: "Checkout" - uses: "actions/checkout@v2.3.0" + uses: "actions/checkout@v2.3.1" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" with: coverage: "none" - extensions: "${{ env.REQUIRED_PHP_EXTENSIONS }}" + extensions: "${{ env.PHP_EXTENSIONS }}" php-version: "${{ matrix.php-version }}" - name: "Validate composer.json and composer.lock"