Skip to content

Commit ba69bc0

Browse files
authored
fix dependencies (#6)
* fix dependencies * Update bundler.yml
1 parent cce6b6e commit ba69bc0

File tree

2 files changed

+7
-20
lines changed

2 files changed

+7
-20
lines changed

.github/workflows/bundler.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ jobs:
1010
container:
1111
image: atk4/image:latest # https://github.com/atk4/image
1212
steps:
13-
- uses: actions/checkout@master
13+
- uses: actions/checkout@v2
14+
with:
15+
ref: ${{ github.ref }}
1416
- run: echo ${{ github.ref }}
1517
- name: Update to stable dependencies
1618
run: |
@@ -19,25 +21,10 @@ jobs:
1921
v=$(echo ${{ github.ref }} | cut -d / -f 4)
2022
echo "::set-env name=version::$v"
2123
22-
- uses: teaminkling/autocommit@master
24+
- uses: stefanzweifel/git-auto-commit-action@v4
2325
with:
24-
commit-message: Setting release dependencies
26+
commit_message: Setting release dependencies
2527
- uses: ad-m/github-push-action@master
2628
with:
2729
branch: ${{ github.ref }}
2830
github_token: ${{ secrets.GITHUB_TOKEN }}
29-
30-
- name: pull-request
31-
uses: romaninsh/pull-request@master
32-
with:
33-
source_branch: "release/${{ env.version }}"
34-
destination_branch: "master" # If blank, default: master
35-
pr_title: "Releasing ${{ env.version }} into master"
36-
pr_body: |
37-
- [ ] Review changes (must include stable dependencies)
38-
- [ ] Merge this PR into master (will delete ${{ github.ref }})
39-
- [ ] Go to Releases and create TAG from master
40-
Do not merge master into develop
41-
pr_reviewer: "romaninsh"
42-
pr_assignee: "romaninsh"
43-
github_token: ${{ secrets.GITHUB_TOKEN }}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"require-release": {
3939
"php": ">=7.3.0",
40-
"atk4/data": "^2.0",
40+
"atk4/data": "~2.3.0",
4141
"vlucas/valitron": "^1.4"
4242
},
4343
"require-dev": {
@@ -47,7 +47,7 @@
4747
"phpunit/phpunit": "*"
4848
},
4949
"require-dev-release": {
50-
"atk4/schema": "^2.0",
50+
"atk4/schema": "~2.3.0",
5151
"friendsofphp/php-cs-fixer": "^2.16",
5252
"phpunit/phpcov": "*",
5353
"phpunit/phpunit": "*"

0 commit comments

Comments
 (0)