diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/draft_new_release.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/update_publicsuffix_data.yml | 17 |
2 files changed, 9 insertions, 24 deletions
diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml index 0e91926b..f1ff1f96 100644 --- a/.github/workflows/draft_new_release.yml +++ b/.github/workflows/draft_new_release.yml @@ -30,18 +30,10 @@ jobs: git config user.name "GitHub Actions" git config user.email noreply@github.com - - name: Commit changelog - run: | - git add CHANGELOG.md - git commit --message "Prepare release ${{ env.RELEASE_VERSION }}" - - - name: Push new branch - run: git push origin release-${{ env.RELEASE_VERSION }} - - - name: Create pull request - uses: thomaseizinger/create-pull-request@1.0.0 + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - head: release-${{ env.RELEASE_VERSION }} + commit-message: "Prepare release ${{ env.RELEASE_VERSION }}" + branch: release-${{ env.RELEASE_VERSION }} base: release title: Release ${{ env.RELEASE_VERSION }} diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml index c0f7103e..34722279 100644 --- a/.github/workflows/update_publicsuffix_data.yml +++ b/.github/workflows/update_publicsuffix_data.yml @@ -21,19 +21,12 @@ jobs: - name: Compare list changes run: if [[ $(git diff --binary --stat) != '' ]]; then echo "::set-env name=UPDATED::true"; fi - - name: Commit changes - if: env.UPDATED == 'true' - run: | - git checkout -b bot/update-psl - git add app/src/main/assets/publicsuffixes - git commit --message "Update Public Suffix List data" - - - name: Create update PR - uses: thomaseizinger/create-pull-request@1.0.0 + - name: Create Pull Request + uses: peter-evans/create-pull-request@v3 if: env.UPDATED == 'true' with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - head: bot/update-psl + commit-message: Update Public Suffix List data + branch: bot/update-psl base: develop title: 'Update Public Suffix List data' - body: 'Updates Public Suffix List from https://publicsuffix.org/list/' + assignees: msfjarvis |