Merge pull request #10354 from pytest-dev/revert-10346-ci-pat

Revert "ci: fix PR not triggering workflows by switching back to pytestbot access token"
This commit is contained in:
Ran Benita 2022-10-08 16:31:26 +03:00 committed by GitHub
commit 81113c1a90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -48,4 +48,4 @@ jobs:
--title "${subject}" \ --title "${subject}" \
--body "Backport of PR #${{ github.event.number }} to $target_branch branch. PR created by backport workflow." --body "Backport of PR #${{ github.event.number }} to $target_branch branch. PR created by backport workflow."
env: env:
GITHUB_TOKEN: ${{ secrets.CHATOPS }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@ -44,9 +44,9 @@ jobs:
- name: Prepare release PR (minor/patch release) - name: Prepare release PR (minor/patch release)
if: github.event.inputs.major == 'no' if: github.event.inputs.major == 'no'
run: | run: |
tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ secrets.CHATOPS }} --prerelease='${{ github.event.inputs.prerelease }}' tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ github.token }} --prerelease='${{ github.event.inputs.prerelease }}'
- name: Prepare release PR (major release) - name: Prepare release PR (major release)
if: github.event.inputs.major == 'yes' if: github.event.inputs.major == 'yes'
run: | run: |
tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ secrets.CHATOPS }} --major --prerelease='${{ github.event.inputs.prerelease }}' tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ github.token }} --major --prerelease='${{ github.event.inputs.prerelease }}'

View File

@ -38,7 +38,7 @@ jobs:
run: python scripts/update-plugin-list.py run: python scripts/update-plugin-list.py
- name: Create Pull Request - name: Create Pull Request
uses: peter-evans/create-pull-request@671dc9c9e0c2d73f07fa45a3eb0220e1622f0c5f uses: peter-evans/create-pull-request@2455e1596942c2902952003bbb574afbbe2ab2e6
with: with:
commit-message: '[automated] Update plugin list' commit-message: '[automated] Update plugin list'
author: 'pytest bot <pytestbot@users.noreply.github.com>' author: 'pytest bot <pytestbot@users.noreply.github.com>'
@ -47,4 +47,3 @@ jobs:
branch-suffix: short-commit-hash branch-suffix: short-commit-hash
title: '[automated] Update plugin list' title: '[automated] Update plugin list'
body: '[automated] Update plugin list' body: '[automated] Update plugin list'
token: ${{ secrets.CHATOPS }}