Skip to content

Commit 981e86a

Browse files
authored
repo sync
2 parents 2c141bb + b0867e6 commit 981e86a

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = [
3131
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
3232
'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',
3333
'repo-sync/github-sync@3832fe8e2be32372e1b3970bbae8e7079edeec88',
34-
'repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3', // repo-sync/[email protected]
34+
'repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d',
3535
'someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd',
3636
'tjenkinson/gh-action-auto-merge-dependency-updates@4d7756c04d9d999c5968697a621b81c47f533d61',
3737
'EndBug/add-and-commit@9358097a71ad9fb9e2f9624c6098c89193d83575',

.github/workflows/repo-sync.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Create pull request
4848
id: create-pull
49-
uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3
49+
uses: repo-sync/pull-request@33777245b1aace1a58c87a29c90321aa7a74bd7d
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
5252
with:
@@ -66,21 +66,8 @@ jobs:
6666
base: main
6767
author: Octomerger
6868

69-
# Sometimes the `repo-sync` branch gets created but GitHub thinks a pull
70-
# request is already attached to the branch. This may happen when an
71-
# external contributor creates a pull request for the `repo-sync` branch
72-
# in a fork, then deletes their repository. If there were changes added
73-
# to the `repo-sync` branch but no pull request can be found, we should
74-
# fail. The failure will then be sent to Slack in the last step.
75-
- name: Check for pull request creation errors
76-
if: ${{ !steps.find-pull-request.outputs.number && steps.create-pull.outputs.has_changed_files == 'true'}}
77-
id: check-pr-creation
78-
run: |
79-
echo 'Unable to create a new PR for the existing branch `repo-sync`. Delete that branch and re-run this workflow to generate a new PR.'
80-
exit 1 # prevents further steps from running
81-
8269
- name: Approve pull request
83-
if: ${{ steps.find-pull-request.outputs.number}}
70+
if: ${{ steps.find-pull-request.outputs.number }}
8471
uses: juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8
8572
with:
8673
github-token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)