Skip to content

Commit

Permalink
Releasing 1.2.1 into master (#29)
Browse files Browse the repository at this point in the history
* fix/Issue#3

Insert model name in crumb
model name from getModelCaption.

* Allow to pass in list of menu actions

* Don't be excessive no the crumbs. Also use ref name to display tabs

* Adding column actions

* make console scroll and better support for closures

* fix callable support and cleanup

* Update MethodExecutor.php

* update composer versions

* added changelog

* cleanup README

* add postgresql dump

* update readme

* fix readme typo

* * add comments
* add ability to pass properties to CRUD and Tabs view
* identify bug of not able to limit link form fields like it's possible in CRUD New/Edit modal form.

* fix typo

* update dependencies

* cleanup

* misc

* Use Card instead of Form and add ability to configure it. fix #2

* fix warning and MariaDB limit issue in subquery

* cleanups

* requirements

* fix dependencies

* it's now called CardTable

* Feature/Update to Ui 2.0 (#26)

* Feature/Update to Ui 2.0

* update

remove addAction method
seed improvement

* fix demo

* Allow object to be return for getViewSeed methods

* fix setModel

* fix/Column and Menu action (#27)

Bring back column and menu action.

* fix/Minor fixes (#28)

* fix/Minor fixe

- path delimiter. Change from reserved url charater code '/' to '-'
   Using reserved charater code in url for path argument cause error when using more than two nested model hierarchy
- unable to find exception class
- remove dynamic class property

* remove php 7.0 and 7.1

* tweak

Co-authored-by: Imants Horsts <[email protected]>

* update composer

* test

* Create release-drafter.yml

* Create unit-tests.yml

* Create bundler.yml

* Setting release dependencies

Co-authored-by: Alain Belair <[email protected]>
Co-authored-by: Romans Malinovskis <[email protected]>
Co-authored-by: Imants Horsts <[email protected]>
Co-authored-by: GitHub Web Flow <[email protected]>
  • Loading branch information
5 people authored Feb 11, 2020
1 parent 5153796 commit 5415135
Show file tree
Hide file tree
Showing 23 changed files with 1,346 additions and 189 deletions.
5 changes: 5 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# See https://github.com/release-drafter/release-drafter#configuration
template: |
## What’s Changed
$CHANGES
43 changes: 43 additions & 0 deletions .github/workflows/bundler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Bundler

on: create

jobs:
autocommit:
name: Update to stable dependencies
if: startsWith(github.ref, 'refs/heads/release/')
runs-on: ubuntu-latest
container:
image: atk4/image:latest # https://github.com/atk4/image
steps:
- uses: actions/checkout@master
- run: echo ${{ github.ref }}
- name: Update to stable dependencies
run: |
# replaces X keys with X-release keys
jq '. as $in | reduce (keys_unsorted[] | select(endswith("-release")|not)) as $k ({}; . + {($k) : (($k + "-release") as $kr | $in | if has($kr) then .[$kr] else .[$k] end) } )' < composer.json > tmp && mv tmp composer.json
v=$(echo ${{ github.ref }} | cut -d / -f 4)
echo "::set-env name=version::$v"
- uses: teaminkling/autocommit@master
with:
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 }}
16 changes: 16 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Release Drafter

on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- develop

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: toolmantim/release-drafter@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50 changes: 50 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Unit Testing

on:
pull_request:
branches: '*'
push:
branches:
- master
- develop

jobs:
unit-test:
name: Unit Testing
runs-on: ubuntu-latest
container:
image: atk4/image:${{ matrix.php }} # https://github.com/atk4/image
strategy:
matrix:
php: ['7.2', '7.3', 'latest']
steps:
- uses: actions/checkout@v1
# need this to trick composer
- run: php --version
- run: "git branch develop; git checkout develop"
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
- uses: actions/cache@v1
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}
restore-keys: |
${{ runner.os }}-composer-
- run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader

- name: Run Tests
run: |
mkdir -p build/logs
- name: SQLite Testing
run: vendor/bin/phpunit --configuration phpunit.xml --coverage-text

- uses: codecov/codecov-action@v1
if: matrix.php == 'latest'
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: build/logs/clover.xml
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php

php:
- '5.6'
- '7.0'
- '7.1'
- '7.2'
- '7.3'

#services:
# - mysql
Expand All @@ -14,11 +13,11 @@ before_script:

after_script:
- echo $TRAVIS_PHP_VERSION
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then echo "Sending coverage report"; vendor/bin/test-reporter; fi
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then echo "Sending codecov report"; bash <(curl -s https://codecov.io/bash); fi
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then echo "Sending coverage report"; vendor/bin/test-reporter; fi
- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ]]; then echo "Sending codecov report"; bash <(curl -s https://codecov.io/bash); fi

script:
- if [[ ${TRAVIS_PHP_VERSION:0:3} != "7.0" ]]; then NC="--no-coverage"; fi
- if [[ ${TRAVIS_PHP_VERSION:0:3} != "7.2" ]]; then NC="--no-coverage"; fi
- ./vendor/phpunit/phpunit/phpunit $NC

cache:
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Change Log

## [1.1.0](https://github.com/atk4/mastercrud/tree/1.1.0) (2019-03-01)

[Full Changelog](https://github.com/atk4/mastercrud/compare/1.0.1...1.1.0)

**Closed issues:**

- MasterCRUD does not have in count fieldsRead or fieldsUpdate ?? [\#18](https://github.com/atk4/mastercrud/issues/18)
- crudception cannot be installed!! [\#17](https://github.com/atk4/mastercrud/issues/17)
- fieldsRead and fieldsUpdate for mastercrud? [\#16](https://github.com/atk4/mastercrud/issues/16)
- crudception does not exist!!!! composer require atk4\crudception [\#15](https://github.com/atk4/mastercrud/issues/15)
- How do you use MasterCRUD to specify which columns you would like to see on the grids? [\#14](https://github.com/atk4/mastercrud/issues/14)
- Mastercrud samples and sql file is missing! [\#13](https://github.com/atk4/mastercrud/issues/13)
- Composer installation of mastercrud errors: [\#12](https://github.com/atk4/mastercrud/issues/12)
- Why composer is locked in ui 1.0 ? [\#11](https://github.com/atk4/mastercrud/issues/11)
- Ability to set a different breadcrumb.. [\#3](https://github.com/atk4/mastercrud/issues/3)
- Refactor to use Card instead of form [\#2](https://github.com/atk4/mastercrud/issues/2)

**Merged pull requests:**

- fix warning and MariaDB limit issue in subquery [\#23](https://github.com/atk4/mastercrud/pull/23) ([romaninsh](https://github.com/romaninsh))
- Feature/card and column [\#22](https://github.com/atk4/mastercrud/pull/22) ([DarkSide666](https://github.com/DarkSide666))

## [1.0.1](https://github.com/atk4/mastercrud/tree/1.0.1) (2018-08-16)

[Full Changelog](https://github.com/atk4/mastercrud/compare/1.0.0...1.0.1)

**Merged pull requests:**

- fix callable support and cleanup a bit [\#10](https://github.com/atk4/mastercrud/pull/10) ([DarkSide666](https://github.com/DarkSide666))
- Add column actions [\#9](https://github.com/atk4/mastercrud/pull/9) ([romaninsh](https://github.com/romaninsh))
- Don't be excessive on the crumbs. Also use ref name to display tabs [\#8](https://github.com/atk4/mastercrud/pull/8) ([romaninsh](https://github.com/romaninsh))
- Feature/menu actions [\#7](https://github.com/atk4/mastercrud/pull/7) ([romaninsh](https://github.com/romaninsh))
- fix/\#3-Ability-to-set-breadcrumb [\#4](https://github.com/atk4/mastercrud/pull/4) ([ibelar](https://github.com/ibelar))

## [1.0.0](https://github.com/atk4/mastercrud/tree/1.0.0) (2018-05-13)

[Full Changelog](https://github.com/atk4/mastercrud/compare/491f34370fd6e2f176d0bbc0346f0fcb66d8b3ec...1.0.0)



\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
Loading

0 comments on commit 5415135

Please sign in to comment.