Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
AureliaEffect committed Mar 22, 2019
2 parents 76e97b3 + c9e3a20 commit 784bddd
Show file tree
Hide file tree
Showing 19 changed files with 1,949 additions and 13,175 deletions.
45 changes: 45 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
version: 2.1

map-1: &filter_only_develop
filters:
branches:
only: develop

map-2: &filter_only_tag
filters:
branches:
ignore: /.*/
tags:
only: /^v?[0-9]+(\.[0-9]+)*$/

orbs:
v1: aurelia/v1@volatile

workflows:
main:
jobs:
- v1/build_test
- v1/build_merge:
<<: *filter_only_develop
requires:
- v1/build_test
- v1/npm_publish:
<<: *filter_only_tag
name: npm_publish_dry
args: "--dry-run"
- request_publish_latest:
<<: *filter_only_tag
type: approval
requires:
- npm_publish_dry
- v1/npm_publish:
<<: *filter_only_tag
name: npm_publish
context: Aurelia
requires:
- request_publish_latest
- v1/merge_back:
<<: *filter_only_tag
requires:
- npm_publish

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ npm-debug.log*
.rollupcache
dist/doc-temp
dist/test
dist
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aurelia-validation",
"version": "1.3.3",
"version": "1.4.0",
"description": "Validation for Aurelia applications",
"keywords": [
"aurelia",
Expand Down
11 changes: 0 additions & 11 deletions circle.yml

This file was deleted.

Loading

0 comments on commit 784bddd

Please sign in to comment.