Skip to content

Commit 137adcc

Browse files
authored
Merge branch 'main' into graphql-schema-update
2 parents a8ce51c + 4545ffd commit 137adcc

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = [
2121
'github/codeql-action/init@v1',
2222
'ianwalter/puppeteer@12728ddef82390d1ecd4732fb543f62177392fbb',
2323
'juliangruber/approve-pull-request-action@c530832d4d346c597332e20e03605aa94fa150a8',
24-
'juliangruber/find-pull-request-action@64d55773c959748ad30a4184f4dc102af1669f7b',
24+
'juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9',
2525
'juliangruber/read-file-action@e0a316da496006ffd19142f0fd594a1783f3b512',
2626
'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8',
2727
'pascalgn/automerge-action@c9bd182',

.github/workflows/repo-sync.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ jobs:
5858
github_token: ${{ secrets.OCTOMERGER_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }}
5959

6060
- name: Find pull request
61-
uses: juliangruber/find-pull-request-action@64d55773c959748ad30a4184f4dc102af1669f7b
61+
uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9
6262
id: find-pull-request
6363
with:
6464
github-token: ${{ secrets.GITHUB_TOKEN }}
6565
branch: repo-sync
6666
base: main
67+
author: Octomerger
6768

6869
- name: Approve pull request
6970
if: ${{ steps.find-pull-request.outputs.number }}

.github/workflows/translations.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ jobs:
1717
echo 'The repo is currently frozen! Exiting this workflow.'
1818
exit 1 # prevents further steps from running
1919
- name: Find original Pull Request
20-
uses: juliangruber/find-pull-request-action@64d55773c959748ad30a4184f4dc102af1669f7b
20+
uses: juliangruber/find-pull-request-action@2fc55e82a6d5d36fe1e7f1848f7e64fd02d99de9
2121
id: pr
2222
with:
2323
github-token: ${{ secrets.GITHUB_TOKEN }}
2424
branch: translations
25+
base: main
26+
author: octoglot
2527
- if: ${{ steps.pr.outputs.number }}
2628
name: Check if already labeled
2729
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9

0 commit comments

Comments
 (0)