Skip to content

Commit ec28ee1

Browse files
authored
Merge branch 'master' into release-500
2 parents bfc67e2 + 01d57d5 commit ec28ee1

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

.github/workflows/subtree.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ jobs:
1919
name: Subtree for Common
2020
runs-on: ubuntu-latest
2121
steps:
22+
- uses: actions/create-github-app-token@v1
23+
id: app-token
24+
with:
25+
app-id: ${{ vars.SUBTREE_APP_ID }}
26+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
27+
owner: ${{ github.repository_owner }}
2228
- uses: actions/checkout@v4
2329
with:
24-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
30+
token: ${{ steps.app-token.outputs.token }}
2531
fetch-depth: 0
2632
- name: Subtree Split
2733
uses: ./.github/actions/subtree
@@ -33,9 +39,15 @@ jobs:
3339
name: Subtree for Http
3440
runs-on: ubuntu-latest
3541
steps:
42+
- uses: actions/create-github-app-token@v1
43+
id: app-token
44+
with:
45+
app-id: ${{ vars.SUBTREE_APP_ID }}
46+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
47+
owner: ${{ github.repository_owner }}
3648
- uses: actions/checkout@v4
3749
with:
38-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
50+
token: ${{ steps.app-token.outputs.token }}
3951
fetch-depth: 0
4052
- name: Subtree Split
4153
uses: ./.github/actions/subtree
@@ -47,9 +59,15 @@ jobs:
4759
name: Subtree for Plugin
4860
runs-on: ubuntu-latest
4961
steps:
62+
- uses: actions/create-github-app-token@v1
63+
id: app-token
64+
with:
65+
app-id: ${{ vars.SUBTREE_APP_ID }}
66+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
67+
owner: ${{ github.repository_owner }}
5068
- uses: actions/checkout@v4
5169
with:
52-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
70+
token: ${{ steps.app-token.outputs.token }}
5371
fetch-depth: 0
5472
- name: Subtree Split
5573
uses: ./.github/actions/subtree
@@ -101,9 +119,15 @@ jobs:
101119
- { folder: TomTom, repository: tomtom-provider }
102120
- { folder: Yandex, repository: yandex-provider }
103121
steps:
122+
- uses: actions/create-github-app-token@v1
123+
id: app-token
124+
with:
125+
app-id: ${{ vars.SUBTREE_APP_ID }}
126+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
127+
owner: ${{ github.repository_owner }}
104128
- uses: actions/checkout@v4
105129
with:
106-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
130+
token: ${{ steps.app-token.outputs.token }}
107131
fetch-depth: 0
108132
- name: Subtree Split
109133
uses: ./.github/actions/subtree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"phpstan/phpstan": "^1.10",
4343
"phpstan/phpstan-phpunit": "^1.3",
4444
"phpunit/phpunit": "^9.6",
45-
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
45+
"symfony/http-client": "^5.4.45 || ^6.4 || ^7.0",
4646
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
4747
},
4848
"suggest": {

0 commit comments

Comments
 (0)