From 927f228db5045b49795dbcbfbce3a057dcf17ac9 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 10 Oct 2020 11:59:01 +0530 Subject: [PATCH] github: update PSL workflow - Use the pull request action utilized by GitHub for their own projects - Switch to $GITHUB_ENV since set-env has been deprecated Signed-off-by: Harsh Shandilya --- .github/workflows/update_publicsuffix_data.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml index 29f1777f..e0e09f86 100644 --- a/.github/workflows/update_publicsuffix_data.yml +++ b/.github/workflows/update_publicsuffix_data.yml @@ -14,19 +14,22 @@ jobs: run: | git config user.name "GitHub Actions" git config user.email noreply@github.com + git checkout -b bot/update-psl - name: Download new publicsuffix data run: curl -L https://github.com/mozilla-mobile/android-components/raw/master/components/lib/publicsuffixlist/src/main/assets/publicsuffixes -o autofill-parser/src/main/assets/publicsuffixes - name: Compare list changes - run: if [[ $(git diff --binary --stat) != '' ]]; then echo "::set-env name=UPDATED::true"; fi + run: if [[ $(git diff --binary --stat) != '' ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + uses: repo-sync/pull-request@v2 if: env.UPDATED == 'true' with: - commit-message: Update Public Suffix List data - branch: bot/update-psl - base: develop - title: 'Update Public Suffix List data' + source_branch: bot/update-psl + destination_branch: develop + pr_title: "Update Public Suffix List data" + pr_body: "This is an automated pull request to update the publicsuffixes file to the latest copy from Mozilla" assignees: msfjarvis + pr_label: PSL + github_token: ${{ secrets.GITHUB_TOKEN }}