Skip to content

Commit

Permalink
Merge pull request #628 from ever-co/develop
Browse files Browse the repository at this point in the history
bring develop to feature branch
  • Loading branch information
evereq authored Jun 14, 2019
2 parents be2212e + 9039e43 commit f00eef0
Show file tree
Hide file tree
Showing 551 changed files with 40,439 additions and 31,112 deletions.
50 changes: 50 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,46 @@ defaults: &defaults
working_directory: /tmp/workspace

jobs:
build-monorepo-root:
<<: *defaults
working_directory: /tmp/workspace/monorepo-root
docker:
- image: circleci/node:10.15.0
steps:
- checkout
- run:
name: 'Installing latest Yarn'
command: |
# remove default yarn
sudo rm -rf $(dirname $(which yarn))/yarn*
# download latest
rm -rf ~/.yarn
curl -o- -L https://yarnpkg.com/install.sh | bash
echo 'export PATH="${PATH}:${HOME}/.yarn/bin:${HOME}/.config/yarn/global/node_modules/.bin"' >> $BASH_ENV
- run:
name: 'Pull Submodules'
command: |
git submodule init
git submodule update --remote
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-monorepo-root-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn install
- run:
name: Run Bootstrap
command: yarn bootstrap
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-monorepo-root-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- persist_to_workspace:
root: /tmp/workspace/monorepo-root
paths:
- '*'
build-backend-api:
<<: *defaults
working_directory: /tmp/workspace/backend/api
Expand Down Expand Up @@ -127,6 +167,9 @@ jobs:
- run:
name: Run Build
command: cd carrier/mobile-ionic && yarn build
- run:
name: Run Ionic Build (Production)
command: cd carrier/mobile-ionic && yarn ionic:build:prod
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-carrier-mobile-ionic-{{ checksum "yarn.lock" }}
Expand Down Expand Up @@ -167,6 +210,9 @@ jobs:
- run:
name: Run Build
command: cd shop/mobile-ionic && yarn build
- run:
name: Run Ionic Build (Production)
command: cd shop/mobile-ionic && yarn ionic:build:prod
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-shop-mobile-ionic-{{ checksum "yarn.lock" }}
Expand Down Expand Up @@ -247,6 +293,9 @@ jobs:
- run:
name: Run Build
command: cd merchant/tablet-ionic && yarn build
- run:
name: Run Ionic Build (Production)
command: cd merchant/tablet-ionic && yarn ionic:build:prod
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-merchant-tablet-ionic-{{ checksum "yarn.lock" }}
Expand Down Expand Up @@ -425,6 +474,7 @@ workflows:
version: 2
build_and_test:
jobs:
- build-monorepo-root
- build-backend-api
- build-admin-website-angular
- build-merchant-tablet-ionic
Expand Down
13 changes: 10 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ We would love for you to contribute to Ever Platform!

If you're changing the structure of the repository please create an issue first.

By default, when you submitting contributions with Pull Requests, we require electronic submission of individual [Contributor Assignment Agreement (CAA)](https://gist.github.com/evereq/95f74ae09510766ffa9379006715ccfd). In some cases (when contributions are very small, at our discretion) instead of CAA we may accept submission of individual [Contributor License Agreement (CLA)](https://gist.github.com/evereq/53ddec283243481344fb61df1706ec40).

If you submitting contribution on behalf of some legal entity, you need to submit Entity Contributor Assignment Agreement (CAA) or Entity Contributor License Agreement (CLA), which you can request by sending us an email to legal@ever.co.

We are using open-source [CLA assistant](https://github.com/cla-assistant/cla-assistant) project to collect your signatures on CAA.
The templates for our CAA/CLA documents generated by http://www.harmonyagreements.org.

## Submitting bug reports

Make sure you are on latest changes.
Expand All @@ -19,6 +26,6 @@ You are more than welcome to submit future requests here https://github.com/ever

This is an open source project.
Contributions you make to this public Ever Platform repository are completely voluntary.
When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment,
you expressly waive any future pay claims against the Ever Co. LTD related to your contribution, and you acknowledge that this does not create an obligation on the part of the Ever Co. LTD of any kind.
Furthermore, your contributing to this project does not create an employer-employee relationship between the Ever Co. LTD and the contributor.
When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment, you expressly waive any future pay claims against the Ever Co. LTD related to your contribution, and you acknowledge that this does not create an obligation on the part of the Ever Co. LTD of any kind. Furthermore, your contributing to this project does not create an employer-employee relationship between the Ever Co. LTD and the contributor.

See also "Submitting Pull Requests" section above for more information on CAA/CLA, required for any contributions.
5 changes: 5 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore: {}
patch: {}
5 changes: 4 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ Different parts of the Platform are made available under the terms of the separa
- Pyro shared modules - [MIT License](https://opensource.org/licenses/MIT)
- Other shared modules - [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.txt)

We suggest to check a great overview about different open-source licenses at https://choosealicense.com/licenses.
Feel free to [Contact Us](https://github.com/ever-co/ever#contact-us) for an additional information about used open-source licenses!

If you decide to choose the Ever Platform Community Edition License, you must comply with the following terms:

This program is free software: you can redistribute it and/or modify it under the terms of the corresponding licenses described in the LICENSE.md files located in software sub-folders and under the terms of licenses described in individual files.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses/.
You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses.

### _Ever Platform Enterprise_ License

Expand Down
Loading

0 comments on commit f00eef0

Please sign in to comment.