diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 5e86a9ee..bd1a3fc2 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -375,12 +375,11 @@ jobs: ) && ( (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')) ) steps: - - name: "Request review from @${{ env.ERGEBNIS_BOT_NAME }}" + - name: "Request review from @ergebnis-bot" uses: "actions/github-script@v3.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" @@ -389,7 +388,7 @@ jobs: const repository = context.repo const reviewers = [ - "${{ env.ERGEBNIS_BOT_NAME }}", + "ergebnis-bot", ] await github.pulls.requestReviewers({ @@ -399,7 +398,7 @@ jobs: reviewers: reviewers, }) - - name: "Assign @${{ env.ERGEBNIS_BOT_NAME }}" + - name: "Assign @ergebnis-bot" uses: "actions/github-script@v3.1" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" @@ -408,7 +407,7 @@ jobs: const repository = context.repo const assignees = [ - "${{ env.ERGEBNIS_BOT_NAME }}", + "ergebnis-bot", ] await github.issues.addAssignees({ @@ -420,7 +419,6 @@ jobs: - name: "Approve pull request" uses: "actions/github-script@v3.1" - if: "github.actor != '${{ env.ERGEBNIS_BOT_NAME }}'" with: github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" script: | diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 85c77c29..6ae62f2c 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -4,11 +4,9 @@ name: "Renew" on: # yamllint disable-line rule:truthy schedule: - - cron: "1 0 1 1 *" + - cron: "0 0 1 1 *" env: - ERGEBNIS_BOT_EMAIL: "bot@ergebn.is" - ERGEBNIS_BOT_NAME: "ergebnis-bot" PHP_EXTENSIONS: "mbstring" jobs: @@ -28,6 +26,8 @@ jobs: steps: - name: "Checkout" uses: "actions/checkout@v2.3.4" + with: + token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" - name: "Install PHP with extensions" uses: "shivammathur/setup-php@2.9.0" @@ -68,19 +68,12 @@ jobs: restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-" - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose" + run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose" - - name: "Open pull request updating license year" - uses: "gr2m/create-or-update-pull-request-action@v1.3.3" + - name: "Commit modified files" + uses: "stefanzweifel/git-auto-commit-action@v4.8.0" with: - author: "${{ env.ERGEBNIS_BOT_NAME }} <${{ env.ERGEBNIS_BOT_EMAIL }}>" - branch: "feature/license-year" - body: | - This PR - - * [x] updates the license year - commit-message: "Enhancement: Update license year" - path: "." - title: "Enhancement: Update license year" - env: - GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}" + commit_author: "ergebnis-bot " + commit_message: "Enhancement: Update license year" + commit_user_email: "bot@ergebn.is" + commit_user_name: "ergebnis-bot" diff --git a/README.md b/README.md index a76e48c8..6894a065 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # classy -[![Integrate](https://github.com/ergebnis/classy/workflows/Integrate/badge.svg?branch=main)](https://github.com/ergebnis/classy/actions) -[![Prune](https://github.com/ergebnis/classy/workflows/Prune/badge.svg?branch=main)](https://github.com/ergebnis/classy/actions) -[![Release](https://github.com/ergebnis/classy/workflows/Release/badge.svg?branch=main)](https://github.com/ergebnis/classy/actions) -[![Renew](https://github.com/ergebnis/classy/workflows/Renew/badge.svg?branch=main)](https://github.com/ergebnis/classy/actions) +[![Integrate](https://github.com/ergebnis/classy/workflows/Integrate/badge.svg)](https://github.com/ergebnis/classy/actions) +[![Prune](https://github.com/ergebnis/classy/workflows/Prune/badge.svg)](https://github.com/ergebnis/classy/actions) +[![Release](https://github.com/ergebnis/classy/workflows/Release/badge.svg)](https://github.com/ergebnis/classy/actions) +[![Renew](https://github.com/ergebnis/classy/workflows/Renew/badge.svg)](https://github.com/ergebnis/classy/actions) [![Code Coverage](https://codecov.io/gh/ergebnis/classy/branch/main/graph/badge.svg)](https://codecov.io/gh/ergebnis/classy) [![Type Coverage](https://shepherd.dev/github/ergebnis/classy/coverage.svg)](https://shepherd.dev/github/ergebnis/classy)