Skip to content

Commit 667ca55

Browse files
committed
Merge branch 'r/20.x' into develop
2 parents 4e49dbd + 94cb4e8 commit 667ca55

3 files changed

Lines changed: 4 additions & 13 deletions

File tree

.github/workflows/pr-deploy-container-image.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches-ignore:
66
- 'dependabot/**'
7-
pull_request_target:
7+
pull_request:
88
types:
99
- opened
1010
- synchronize
@@ -18,9 +18,6 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- uses: actions/checkout@v5
21-
with:
22-
ref: ${{ github.event.pull_request.head.ref }}
23-
repository: ${{ github.event.pull_request.head.repo.full_name }}
2421

2522
- name: Prepare commit hash
2623
run: git rev-parse HEAD > commit
@@ -47,7 +44,7 @@ jobs:
4744
labels: ${{ steps.meta.outputs.labels }}
4845

4946
- name: Add comment
50-
if: github.event_name == 'pull_request_target'
47+
if: github.event_name == 'pull_request'
5148
uses: thollander/actions-comment-pull-request@v3
5249
with:
5350
comment-tag: container-image

.github/workflows/pr-deploy-test-branch.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PRs » Publish Pull Request Page
22

33
on:
4-
pull_request_target:
4+
pull_request:
55
types:
66
- opened
77
- synchronize
@@ -23,9 +23,6 @@ jobs:
2323
steps:
2424
- name: Checkout sources
2525
uses: actions/checkout@v5
26-
with:
27-
ref: ${{github.event.pull_request.head.ref}}
28-
repository: ${{github.event.pull_request.head.repo.full_name}}
2926

3027
- name: Determine the correct test server
3128
id: test-server
@@ -49,9 +46,6 @@ jobs:
4946

5047
- name: Checkout sources
5148
uses: actions/checkout@v5
52-
with:
53-
ref: ${{github.event.pull_request.head.ref}}
54-
repository: ${{github.event.pull_request.head.repo.full_name}}
5549

5650
- name: Ensure our node version matches the main repo's version
5751
run: |

src/utils/bulkActionUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export const isStartable = (event: Event) => {
117117
return (
118118
event.event_status.toUpperCase().indexOf("PROCESSED") > -1 ||
119119
event.event_status.toUpperCase().indexOf("PROCESSING_FAILURE") > -1 ||
120-
event.event_status.toUpperCase().indexOf("PROCESSING_CANCELED") > -1 ||
120+
event.event_status.toUpperCase().indexOf("PROCESSING_CANCELLED") > -1 ||
121121
!event.selected
122122
);
123123
};

0 commit comments

Comments
 (0)