diff --git a/.travis.yml b/.travis.yml index 9844ec7..833cf4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,35 +14,31 @@ script: notifications: email: - ebrehault@gmail.com -before_deploy: - if [[ $TRAVIS_TAG ]]; then - cd dist/grange-core; - else - git config --global user.email "build@travis-ci.com"; - git config --global user.name "Travis CI"; - export PACKAGE_VERSION=$(npm run get_version | tail -n 1); - if ! [ $(git tag -l "$PACKAGE_VERSION") ]; then - echo "TAGGING $PACKAGE_VERSION..."; - export PUSH_TAG="ok"; - git tag $PACKAGE_VERSION; - fi - fi -deploy: - - provider: releases - api_key: - secure: mJQHF3GdCzCFo+2sB6PEtJJjbbleE92fCugN9uIeOynsXYpZ169/2QGhWp0hGpjm3/BNfR07lnHlowCTAorQmsMVdyW6Ud8Ob9g8N45kv35QyibiaO75BBReMuKQbSXx3tfNWrlDcNmpGv/ja0qb4vJEJBL96KjOOEHNA7fdJE88MR35muLZx1GxTkKiAGljhzGHfz/4wFJy3TpVMIB3dQ8vwoWF1Gt8WFAUg8ZxbyWcz4laIKAjZ2F8pdF+dTiRJWEaCiCu8MluCdGHre4LJ4YEAV6P62G8ohN5YKneh+X6OXtGvK497+TA1Hae7xBjzNn3j1ExekUw4aglSj5jTIZ3TA7C5OmBNk23I1aBiHVv2NB+eJNsZVWP0OXxghMkSwPnOIePJr14Que9uA7sYvs5rQ6yuYh7dVMZdxAZAU906HC2J1L/ZXJwDljIg4VXk888dtS/q9ApeR7NJnXXDXkSKmbJEB7D9ftcWlZlnOvqyDKuuKksvCl1k947aBDgvV8A+LNoe1G/wWMTN3/87W4400biLYqPW9hn2G9GVmpyTGqr1atKv+CrPK3NzubBPF96b5CTsG5YOegv1W0eNQ85eVbsHuJvyZQqypN8cohrTEFSSDHpcQ2pYelcWfrA+j8AExB4mUsd/6Bj7oMEBXBVCYdHz5HxqqEiEnDNTQg= - name: Build $PACKAGE_VERSION - on: - repo: guillotinaweb/grange-core - branch: master - condition: $PUSH_TAG IS present - - provider: npm - edge: true - email: ebrehault@gmail.com - skip_cleanup: true - api_key: - secure: j2PA/ZVT7SxyGem/e81N86JX50Ij7RL88DN5RnUqLWohW3c2kFU9IgL4AVccX12AoXSinwe5sqHAs85hZzM7sgTwFirsuUKpfDbRUzx3RixDBMU482RX3v9IddYqrP4Y3Lz8og9NaTPlrwnPwh4yoy4H2swbswk2XqpoRr551QNRK1b3xPAogf6Ie9phRJuLxaRKCyYOy5EcCbOobn2/iH26lM409Zb6EDsCGSxz/i7djGDBWqWdFsKDTJRYmycCvJdwciOV6beQVOOtDvO2X9PBtLH2PIkLqkOoIDwL0PLGEFxZxIcY1/54zIBNHfQX3xGiRwF2wD4ihp46ZQpGOW669HLsPWikSS5XJ+VZ59AOS7aKhOsyFudQauFxIf7uf9UVwOQRlx2qXQJ1DcBD2Ttus6op3hYnbFGnFTvo7LGtzlO5L3Hwth3V5XiEe8EN1OBpItrLrUg03XNj5OCYEPn5iQm0g2j0cN93G5tRPTtzGECLtFoyS9vH+EGYgeo3WOLkwI/v3T2B11h3ZDe4cCLUw3ONft/XHKl8QjKyNrzb8Mx+Efe4sSm/zA6byH0XniF5hhVBSXwN7eivW9qRuEtZXrV8r1TbyUZ5pQ4CUqLNh21R4XNBFQReJ/KaPIH6MU49NwLKXObFwS/rLN37QnOLovBQyIy8FBEgxfWN/0U= - on: - tags: true - repo: guillotinaweb/grange-core - branch: master +jobs: + include: + - stage: Tagging + if: (branch = master) AND (tag IS blank) + after_success: source ./deploy.sh + deploy: + provider: releases + api_key: + secure: mJQHF3GdCzCFo+2sB6PEtJJjbbleE92fCugN9uIeOynsXYpZ169/2QGhWp0hGpjm3/BNfR07lnHlowCTAorQmsMVdyW6Ud8Ob9g8N45kv35QyibiaO75BBReMuKQbSXx3tfNWrlDcNmpGv/ja0qb4vJEJBL96KjOOEHNA7fdJE88MR35muLZx1GxTkKiAGljhzGHfz/4wFJy3TpVMIB3dQ8vwoWF1Gt8WFAUg8ZxbyWcz4laIKAjZ2F8pdF+dTiRJWEaCiCu8MluCdGHre4LJ4YEAV6P62G8ohN5YKneh+X6OXtGvK497+TA1Hae7xBjzNn3j1ExekUw4aglSj5jTIZ3TA7C5OmBNk23I1aBiHVv2NB+eJNsZVWP0OXxghMkSwPnOIePJr14Que9uA7sYvs5rQ6yuYh7dVMZdxAZAU906HC2J1L/ZXJwDljIg4VXk888dtS/q9ApeR7NJnXXDXkSKmbJEB7D9ftcWlZlnOvqyDKuuKksvCl1k947aBDgvV8A+LNoe1G/wWMTN3/87W4400biLYqPW9hn2G9GVmpyTGqr1atKv+CrPK3NzubBPF96b5CTsG5YOegv1W0eNQ85eVbsHuJvyZQqypN8cohrTEFSSDHpcQ2pYelcWfrA+j8AExB4mUsd/6Bj7oMEBXBVCYdHz5HxqqEiEnDNTQg= + name: Build $PACKAGE_VERSION + on: + repo: guillotinaweb/grange-core + branch: master + tags: true + - stage: NPM release + if: tag IS present + before_deploy: cd dist/grange-core + deploy: + provider: npm + edge: true + email: ebrehault@gmail.com + skip_cleanup: true + api_key: + secure: j2PA/ZVT7SxyGem/e81N86JX50Ij7RL88DN5RnUqLWohW3c2kFU9IgL4AVccX12AoXSinwe5sqHAs85hZzM7sgTwFirsuUKpfDbRUzx3RixDBMU482RX3v9IddYqrP4Y3Lz8og9NaTPlrwnPwh4yoy4H2swbswk2XqpoRr551QNRK1b3xPAogf6Ie9phRJuLxaRKCyYOy5EcCbOobn2/iH26lM409Zb6EDsCGSxz/i7djGDBWqWdFsKDTJRYmycCvJdwciOV6beQVOOtDvO2X9PBtLH2PIkLqkOoIDwL0PLGEFxZxIcY1/54zIBNHfQX3xGiRwF2wD4ihp46ZQpGOW669HLsPWikSS5XJ+VZ59AOS7aKhOsyFudQauFxIf7uf9UVwOQRlx2qXQJ1DcBD2Ttus6op3hYnbFGnFTvo7LGtzlO5L3Hwth3V5XiEe8EN1OBpItrLrUg03XNj5OCYEPn5iQm0g2j0cN93G5tRPTtzGECLtFoyS9vH+EGYgeo3WOLkwI/v3T2B11h3ZDe4cCLUw3ONft/XHKl8QjKyNrzb8Mx+Efe4sSm/zA6byH0XniF5hhVBSXwN7eivW9qRuEtZXrV8r1TbyUZ5pQ4CUqLNh21R4XNBFQReJ/KaPIH6MU49NwLKXObFwS/rLN37QnOLovBQyIy8FBEgxfWN/0U= + on: + tags: true + repo: guillotinaweb/grange-core + branch: master diff --git a/CHANGELOG.md b/CHANGELOG.md index 9730b78..ce142d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.2.3 (2020-06-02) + +- Add config service to global service +- Fix Travis deployment + # 1.2.2 (2020-06-02) - If missing, generate id when creating a resource diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..b56b302 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +git config --global user.email "build@travis-ci.com"; +git config --global user.name "Travis CI"; +export PACKAGE_VERSION=$(npm run get_version | tail -n 1); +if ! [ $(git tag -l "$PACKAGE_VERSION") ]; then + echo "TAGGING $PACKAGE_VERSION..."; + export TRAVIS_TAG=$PACKAGE_VERSION; + git tag $PACKAGE_VERSION; +fi diff --git a/projects/grange-core/package.json b/projects/grange-core/package.json index 6e652ab..c3ee361 100644 --- a/projects/grange-core/package.json +++ b/projects/grange-core/package.json @@ -1,6 +1,6 @@ { "name": "@guillotinaweb/grange-core", - "version": "1.2.2", + "version": "1.2.3", "license": "MIT", "author": { "name": "Eric Brehault", diff --git a/projects/grange-core/src/lib/core.service.ts b/projects/grange-core/src/lib/core.service.ts index d9ac774..c4334c1 100644 --- a/projects/grange-core/src/lib/core.service.ts +++ b/projects/grange-core/src/lib/core.service.ts @@ -5,6 +5,7 @@ import { CacheService } from './cache.service'; import { LoadingService } from './loading.service'; import { ResourceService } from './resource.service'; import { WebsocketService } from './websocket.service'; +import { ConfigurationService } from './configuration.service'; @Injectable({ providedIn: 'root' @@ -15,6 +16,7 @@ export class GrangeCore { public api: APIService, public auth: AuthenticationService, public cache: CacheService, + public config: ConfigurationService, public loading: LoadingService, public resource: ResourceService, public websocket: WebsocketService,