diff --git a/.gitignore b/.gitignore index d42521dff..9af71dc1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # output dir target +/build-dir +/build-cache +/deploy-with-env.sh # KDE .directory diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ba2e37dcb..000000000 --- a/.travis.yml +++ /dev/null @@ -1,57 +0,0 @@ -language: java -sudo: false - -addons: - chrome: stable - -jdk: - - oraclejdk11 - -cache: - directories: - - $HOME/mvn_repo - - $HOME/.node_modules -branches: - only: - - master - - travis - - /^release-.+$/ - - /^dev-.+/ - -before_install: - - export MVN_CMD="mvn -Dmaven.repo.local=$HOME/mvn_repo -B" - - OLD_VERSION=`$MVN_CMD help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download)"` - - BASE_VERSION=${OLD_VERSION%-SNAPSHOT} - - NEW_VERSION=${BASE_VERSION}-dev-`printf %d $TRAVIS_BUILD_NUMBER` - - ECLIPSE_VERSION=${BASE_VERSION}.dev_`printf %d $TRAVIS_BUILD_NUMBER` - - export NEW_VERSION - - export ECLIPSE_VERSION - - export BASE_VERSION - - echo "Building version $NEW_VERSION" - - ./set-version.sh $NEW_VERSION $ECLIPSE_VERSION - - rm -rf $HOME/.phpenv - - rm -rf $HOME/.rvm - - rm -rf $HOME/.m2 - -script: - - $MVN_CMD -e install -Dteavm.junit.optimized=false -Dteavm.junit.js.decodeStack=false -P with-idea -P with-cli -Dteavm.junit.threads=2 -Dteavm.junit.js.runner=browser-chrome -V - - rm -rf $BASE_PATH/tests/target/js-tests - - rm -rf $BASE_PATH/html4j/target/js-tests - - du -sh $HOME/.[!.]* /home/travis/* | sort -h - - df - -after_success: > - if [[ "${TRAVIS_PULL_REQUEST:-unknown}" == "false" && $TRAVIS_BRANCH == dev-* ]] ; then - export NEW_VERSION - export FTP_HOST - export FTP_PORT - export FTP_USER - export FTP_PATH - export SSH_KEY - mv -f $HOME/built_artifacts_backup $HOME/mvn_repo/org/teavm - $MVN_CMD deploy -Dteavm.build.all=false -DskipTests --settings travis-settings.xml \ - -P deploy-to-bintray -P with-idea -P with-cli -P !download-dependencies && \ - ./upload-files.sh - fi -before_cache: - - mv -f $HOME/mvn_repo/org/teavm $HOME/built_artifacts_backup diff --git a/README.md b/README.md index 4df10e122..b8870e3e4 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ TeaVM ===== - -[![Build Status](https://travis-ci.org/konsoletyper/teavm.svg?branch=master)](https://travis-ci.org/konsoletyper/teavm) + [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.teavm/teavm-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.teavm/teavm-maven-plugin) -[![Bintray](https://api.bintray.com/packages/konsoletyper/teavm/teavm-dev/images/download.svg)](https://bintray.com/konsoletyper/teavm/teavm-dev/_latestVersion) +[![Download](https://teavm.org/maven/badge.svg)](https://teavm.org/maven/_latest) [![Gitter chat](https://img.shields.io/badge/gitter-join%20chat-green.svg)](https://gitter.im/teavm/Lobby) [![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/konsoletyper/teavm.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/konsoletyper/teavm/context:java) [![Total Alerts](https://img.shields.io/lgtm/alerts/g/konsoletyper/teavm.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/konsoletyper/teavm/alerts) diff --git a/build-all.sh b/build-all.sh new file mode 100755 index 000000000..298b3e26a --- /dev/null +++ b/build-all.sh @@ -0,0 +1,34 @@ +# +# Copyright 2021 Alexey Andreev. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +if [[ ! -d build-dir ]] ; then + mkdir build-dir +fi + +git archive master | tar -x -C build-dir + +pushd build-dir + +mvn -e -V install \ + -P with-idea -P with-cli \ + -Dteavm.junit.optimized=false \ + -Dteavm.junit.js.decodeStack=false \ + -Dteavm.junit.threads=4 \ + -Dteavm.junit.js.runner=browser-chrome + +rm -rf * + +popd \ No newline at end of file diff --git a/travis-settings.xml b/deploy-settings.xml similarity index 84% rename from travis-settings.xml rename to deploy-settings.xml index 371f7c160..4b69f2ba9 100644 --- a/travis-settings.xml +++ b/deploy-settings.xml @@ -1,5 +1,5 @@ (.+)<\/version>/$1<\/version>/" dep-pom.xml -#sed -r -i -e "s/(lib\/teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" build.properties -#sed -r -i -e "s/(lib\/teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" META-INF/MANIFEST.MF -#cd .. - -#cd m2e-plugin -#sed -r -i -e "s/.+<\/versionRange>/$1<\/versionRange>/" lifecycle-mapping-metadata.xml -#cd .. - -#cd ../.. - diff --git a/upload-files.sh b/upload-files.sh index e2cb3bfcd..958e759e9 100755 --- a/upload-files.sh +++ b/upload-files.sh @@ -12,15 +12,7 @@ scp -o StrictHostKeyChecking=no -i /tmp/sftp_rsa -B -r -P $FTP_PORT tools/cli/ta # # Update IDEA repository descriptor # -cat <.idea-repository.xml - - - - - TeaVM support - - -EOF + scp -o StrictHostKeyChecking=no -i /tmp/sftp_rsa -B -r -P $FTP_PORT .idea-repository.xml $SCP_TARGET/idea/dev/teavmRepository.xml