diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000..ad4e4e6b7e --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,25 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/openjdk:8-jdk-browsers + working_directory: ~/repo + environment: + JVM_OPTS: -Xmx3200m + TERM: dumb + steps: + - checkout + - restore_cache: # restore the saved cache after the first run or if `pom.xml` has changed + key: winery-{{ checksum "pom.xml" }} + - run: mvn -q package + - save_cache: # saves the project dependencies + paths: + - ~/.m2 + key: winery-{{ checksum "pom.xml" }} + - run: mkdir -p collected-surefire-reports && find . -mindepth 2 -maxdepth 3 -type d -name "surefire-reports" -exec bash -c 'cp -r {}/* collected-surefire-reports/' Cp {} \; + - store_test_results: # uploads the test metadata from the `target/surefire-reports` directory so that it can show up in the CircleCI dashboard. + path: collected-surefire-reports/ + - run: mkdir -p collected-artifacts && find . -mindepth 3 -maxdepth 4 -type f -name "*.jar" -exec cp -r {} collected-artifacts/ \; + - run: mkdir -p collected-artifacts && find . -mindepth 3 -maxdepth 4 -type f -name "*.war" -exec cp -r {} collected-artifacts/ \; + - store_artifacts: + path: collected-artifacts/ diff --git a/.editorconfig b/.editorconfig index cc6c6dc8eb..86c240b0d0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,6 +14,12 @@ indent_size = 2 [*.sh] indent_size = 2 +[*.yaml] +indent_size = 2 + +[*.yml] +indent_size = 2 + [bower.json] indent_size = 2 diff --git a/.gitignore b/.gitignore index e1652b3fea..2e1e289a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ release.properties **/pom.xml.* **/rebel.xml target/ +collected-*/ node_modules/ winery-debug.log **/gen/** diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 12c72611a0..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: java - -#We build against the latest JDK -jdk: - - oraclejdk8 - -#We build at Ubuntu 14.04 (Trusty Thar) as we want to use a more recent Ubuntu version -sudo: required -dist: trusty - -before_install: - # This is https://github.com/codacy/codacy-coverage-reporter#install-jpm, but the SSL certificate is expired, therefore we directly do the commands of the install script here - # This is needed, because we use TypeScript and Java in one project - # Disabled because of https://github.com/codacy/codacy-coverage-reporter/issues/46 - #- curl -sL https://cdn.rawgit.com/jpm4j/jpm4j.installers/6b3c5176/dist/biz.aQute.jpm.run.jar >jpm4j.jar - #- java -jar jpm4j.jar -u init - # - ~/jpm/bin/jpm install com.codacy:codacy-coverage-reporter:assembly - - mvn -q resources:resources -pl org.eclipse.winery.repository.configuration - -script: - - mvn -q package -# - mvn jacoco:report-aggregate