Skip to content

Commit

Permalink
Release/2.3.1 (#61)
Browse files Browse the repository at this point in the history
* Fix dependencies (#60)

* fix dependencies

* use develop

* Update bundler.yml

* Setting release dependencies
  • Loading branch information
DarkSide666 committed Oct 14, 2020
1 parent 2c2216b commit d1eb9b7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 21 deletions.
23 changes: 5 additions & 18 deletions .github/workflows/bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ jobs:
container:
image: atk4/image:latest # https://github.com/atk4/image
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
- run: echo ${{ github.ref }}
- name: Update to stable dependencies
run: |
Expand All @@ -19,25 +21,10 @@ jobs:
v=$(echo ${{ github.ref }} | cut -d / -f 4)
echo "::set-env name=version::$v"
- uses: teaminkling/autocommit@master
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit-message: Setting release dependencies
commit_message: Setting release dependencies
- uses: ad-m/github-push-action@master
with:
branch: ${{ github.ref }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: pull-request
uses: romaninsh/pull-request@master
with:
source_branch: "release/${{ env.version }}"
destination_branch: "master" # If blank, default: master
pr_title: "Releasing ${{ env.version }} into master"
pr_body: |
- [ ] Review changes (must include stable dependencies)
- [ ] Merge this PR into master (will delete ${{ github.ref }})
- [ ] Go to Releases and create TAG from master
Do not merge master into develop
pr_reviewer: "romaninsh"
pr_assignee: "romaninsh"
github_token: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
},
"require": {
"php": ">=7.3.0",
"atk4/ui": "^2.3",
"atk4/data": "^2.3"
"atk4/ui": "~2.3.0",
"atk4/data": "~2.3.0"
},
"require-dev": {
"atk4/schema": "^2.3",
"atk4/schema": "~2.3.0",
"friendsofphp/php-cs-fixer": "^2.16",
"phpunit/phpunit": "*",
"symfony/contracts": ">=1.1"
Expand Down

0 comments on commit d1eb9b7

Please sign in to comment.