Skip to content

Commit ac1d726

Browse files
Merge commit '801aa53fc989ff6fa32695a8b3f2ae40a5df7522' into release/next-v3.2.0
2 parents 9c60d9a + 801aa53 commit ac1d726

File tree

6 files changed

+20
-8
lines changed

6 files changed

+20
-8
lines changed

.github/labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ typescript:
44
- '**/*.ts'
55
php:
66
- '**/*.php'
7+
python:
8+
- '**/*.py'
79

810
'Type: Testing':
911
- '**/tests/*'

.github/workflows/add-release-tag.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ on:
22
pull_request:
33
branches:
44
- master
5+
- main
56
- develop/v*
67
types: [closed]
78

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: echo "::set-env name=RUNNING::1"
1818
- uses: actions/checkout@v2
1919
- uses: technote-space/get-git-comment-action@v1
20-
- uses: technote-space/get-diff-action@v1
20+
- uses: technote-space/get-diff-action@v2
2121
with:
2222
PREFIX_FILTER: |
2323
src/
@@ -66,7 +66,7 @@ jobs:
6666
run: echo "::set-env name=RUNNING::1"
6767
- uses: actions/checkout@v2
6868
- uses: technote-space/get-git-comment-action@v1
69-
- uses: technote-space/get-diff-action@v1
69+
- uses: technote-space/get-diff-action@v2
7070
with:
7171
PREFIX_FILTER: |
7272
src/

.github/workflows/pr-opened.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
on:
2-
pull_request:
2+
pull_request_target:
33
types: [opened]
44

55
name: Pull Request opened
66

77
jobs:
88
assignToProject:
9-
if: github.event.pull_request.head.user.id == github.event.pull_request.base.user.id
109
name: Assign PullRequest to Project
1110
runs-on: ubuntu-latest
1211
timeout-minutes: 3

.github/workflows/pr-updated.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
on: pull_request
1+
on: pull_request_target
22

33
name: Pull Request updated
44

@@ -55,6 +55,8 @@ jobs:
5555
- name: Set running flag
5656
run: echo "::set-env name=RUNNING::1"
5757
- uses: actions/checkout@v2
58+
with:
59+
ref: ${{ github.head_ref }}
5860
- name: Set running flag
5961
run: |
6062
if [[ ! -f package.json ]] || [[ $(< package.json jq -r '.version == null') == 'true' ]]; then
@@ -96,6 +98,8 @@ jobs:
9698
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
9799

98100
- uses: actions/checkout@v2
101+
with:
102+
ref: ${{ github.head_ref }}
99103
if: env.RUNNING
100104
- uses: technote-space/can-npm-publish-action@v1
101105
if: env.RUNNING

.github/workflows/update-dependencies.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@ jobs:
1414
runs-on: ubuntu-latest
1515
timeout-minutes: 10
1616
steps:
17+
- name: Set running flag
18+
run: echo "::set-env name=RUNNING::"
19+
- name: Set running flag
20+
run: echo "::set-env name=RUNNING::1"
21+
if: github.event.pull_request.head.user.id == github.event.pull_request.base.user.id)
1722
- uses: technote-space/load-config-action@v1
23+
if: env.RUNNING
1824
with:
1925
CONFIG_FILENAME: workflow-settings.json
2026
- uses: technote-space/auto-cancel-redundant-job@v1
27+
if: env.RUNNING
2128
with:
2229
EXCLUDE_MERGED: 'true'
2330
- name: Update dependencies
31+
if: env.RUNNING
2432
id: update_deps
2533
uses: technote-space/create-pr-action@v2
2634
with:
@@ -37,11 +45,9 @@ jobs:
3745
TARGET_BRANCH_PREFIX: release/
3846
AUTO_MERGE_THRESHOLD_DAYS: 14
3947

40-
- name: Set running flag
41-
run: echo "::set-env name=RUNNING::"
4248
- name: Set running flag
4349
run: echo "::set-env name=RUNNING::1"
44-
if: steps.update_deps.outputs.result != 'succeeded' && github.event_name == 'pull_request' && github.event.action != 'closed' && github.event.pull_request.head.user.id == github.event.pull_request.base.user.id && startsWith(github.head_ref, 'release/')
50+
if: env.RUNNING && steps.update_deps.outputs.result != 'succeeded' && github.event_name == 'pull_request' && github.event.action != 'closed' && startsWith(github.head_ref, 'release/')
4551
- uses: actions/checkout@v2
4652
if: env.RUNNING
4753
- name: Set running flag

0 commit comments

Comments
 (0)