Skip to content
This repository has been archived by the owner on Nov 19, 2022. It is now read-only.

Commit

Permalink
Merge branch 'develop' of github.com:LuisAlejandro/pypicontents into …
Browse files Browse the repository at this point in the history
…develop
  • Loading branch information
LuisAlejandro committed Apr 23, 2022
2 parents d669b43 + 39d31d4 commit 1804d8d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
ref: develop
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Installing dependencies
Expand Down Expand Up @@ -90,12 +90,12 @@ jobs:
needs: finish
steps:
- name: Approve
uses: hmarr/auto-approve-action@v2.0.0
uses: hmarr/auto-approve-action@v2.2.1
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
- name: Approve
uses: hmarr/auto-approve-action@v2.0.0
uses: hmarr/auto-approve-action@v2.2.1
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
Expand All @@ -107,7 +107,7 @@ jobs:
needs: approve
steps:
- name: Merge
uses: actions/github-script@v5
uses: actions/github-script@v6
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
Expand All @@ -118,7 +118,7 @@ jobs:
pull_number: context.payload.pull_request.number
})
- name: Merge
uses: actions/github-script@v5
uses: actions/github-script@v6
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
ref: develop
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Installing dependencies
Expand Down

0 comments on commit 1804d8d

Please sign in to comment.