diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-11-12 21:04:27 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 21:04:27 +0530 |
| commit | 3d33b1d83d04867e47cb9058fe23c4adbf3faa56 (patch) | |
| tree | 1cfe5a2f4fd753203fa6dd1992a134831ea89d83 | |
| parent | bbadf4a68df41ae91acf161833c4d13e4c77c4eb (diff) | |
Try fixing PSL update workflow (#1538)
* Revert "Directly push PSL updates to develop (#1494)"
This reverts commit a6b8e79d36d8900597aec8dfc2eb57838bb14188.
* github: enable auto merge of PSL pull requests
| -rw-r--r-- | .github/workflows/update_publicsuffix_data.yml | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml index 2bfb51f8..bc6132c9 100644 --- a/.github/workflows/update_publicsuffix_data.yml +++ b/.github/workflows/update_publicsuffix_data.yml @@ -1,5 +1,6 @@ name: Update Publix Suffix List data on: + workflow_dispatch: schedule: - cron: '0 0 * * 6' @@ -9,9 +10,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - with: - persist-credentials: false - fetch-depth: 0 - name: Download new publicsuffix data uses: gradle/gradle-build-action@cba1833ddecbbee649950c284416981928631008 @@ -27,16 +25,32 @@ jobs: with: arguments: :autofill-parser:test -PslimTests - - name: Commit changes + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@01f7dd1d28f5131231ba3ede0f1c8cb413584a1d if: env.UPDATED == 'true' - run: | - git config --local user.name "GitHub Actions" - git config --local user.email "noreply@github.com" - git commit -am "autofill-parser: update publicsuffixes file" + with: + assignees: msfjarvis + author: GitHub Actions <noreply@github.com> + base: develop + body: This is an automated pull request to update the publicsuffixes file to the latest copy from Mozilla + branch: bot/update-psl + commit-message: "autofill-parser: update publicsuffixes file" + labels: PSL + title: Update Public Suffix List data + token: ${{ secrets.GITHUB_TOKEN }} - - name: Push to develop - uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 - if: env.UPDATED == 'true' + - name: Auto approve + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: juliangruber/approve-pull-request-action@36e19d8a79c9c62bf85a0565cb2799a3cf395343 + with: + github-token: ${{ secrets.PSL_UPDATE_TOKEN }} + number: ${{ steps.cpr.outputs.pull-request-number }} + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@d2ede5636b3febc92809259995e643565e675aab with: - github_token: ${{ secrets.PSL_UPDATE_TOKEN }} - branch: develop + token: ${{ secrets.PSL_UPDATE_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash |