From d1eb9b78ec399387f6f83bf6765e66729b982eed Mon Sep 17 00:00:00 2001 From: Imants Horsts Date: Wed, 14 Oct 2020 23:47:36 +0300 Subject: [PATCH] Release/2.3.1 (#61) * Fix dependencies (#60) * fix dependencies * use develop * Update bundler.yml * Setting release dependencies --- .github/workflows/bundler.yml | 23 +++++------------------ composer.json | 6 +++--- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.github/workflows/bundler.yml b/.github/workflows/bundler.yml index 107fac9c..953db85b 100644 --- a/.github/workflows/bundler.yml +++ b/.github/workflows/bundler.yml @@ -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: | @@ -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 }} diff --git a/composer.json b/composer.json index 696f715f..5fa430d8 100644 --- a/composer.json +++ b/composer.json @@ -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"