From 7fefcfe436150ef30a76bb14e40d5061833091d7 Mon Sep 17 00:00:00 2001 From: Jonathan Thoene Date: Tue, 1 Sep 2020 11:38:33 +0200 Subject: [PATCH 01/16] Added 2019-06 target as lowest Base Target possible --- releng/com.yakindu.solidity.releng/pom.xml | 29 ++++++++++++++ .../2019-06.target | 38 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 releng/com.yakindu.solidity.target/2019-06.target diff --git a/releng/com.yakindu.solidity.releng/pom.xml b/releng/com.yakindu.solidity.releng/pom.xml index 9f24005c..4c1c34eb 100644 --- a/releng/com.yakindu.solidity.releng/pom.xml +++ b/releng/com.yakindu.solidity.releng/pom.xml @@ -68,6 +68,35 @@ + + 2019-06.target + + true + + + 2.18.0 + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + true + + + com.yakindu.solidity + com.yakindu.solidity.target + ${project.version} + 2019-06 + + + + + + + ../com.yakindu.solidity.target diff --git a/releng/com.yakindu.solidity.target/2019-06.target b/releng/com.yakindu.solidity.target/2019-06.target new file mode 100644 index 00000000..7051e7e2 --- /dev/null +++ b/releng/com.yakindu.solidity.target/2019-06.target @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 4f31c934082656f2003f1ae2dffc82d7a07b029a Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 12:05:59 +0200 Subject: [PATCH 02/16] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ffbf18ed..de4463a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,13 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb - - TARGET=Latest.target before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew jobs: include: + - env: TARGET=2019-06.target + if: branch = master + - env: TARGET=Latest.target - stage: Build YAKINDU Solidity IDE and language server script: - cd releng/com.yakindu.solidity.releng From eefbb1c0700d411c210a296621c4a7ea30b4504b Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 12:39:58 +0200 Subject: [PATCH 03/16] Update .travis.yml --- .travis.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index de4463a3..4fe0f2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,27 +22,26 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb -before_install: - - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew -jobs: +matrix: include: - env: TARGET=2019-06.target if: branch = master - env: TARGET=Latest.target - - stage: Build YAKINDU Solidity IDE and language server - script: - - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests - - cd ../com.yakindu.solidity.repository/target - - zip -r repository.zip repository - - cd $TRAVIS_BUILD_DIR/extensions/vscode - - ./gradlew vscodeExtension - - cd $TRAVIS_BUILD_DIR - - cp -r plugins/com.yakindu.solidity.ide/target/languageserver extensions/theia/xtext-dsl-extension/languageserver - - cd extensions/theia/ - - yarn install - - cd $TRAVIS_BUILD_DIR - - docker build extensions/. -t yakindu/solidity-ide +before_install: + - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew +script: + - cd releng/com.yakindu.solidity.releng + - mvn clean verify -P$TARGET,tests + - cd ../com.yakindu.solidity.repository/target + - zip -r repository.zip repository + - cd $TRAVIS_BUILD_DIR/extensions/vscode + - ./gradlew vscodeExtension + - cd $TRAVIS_BUILD_DIR + - cp -r plugins/com.yakindu.solidity.ide/target/languageserver extensions/theia/xtext-dsl-extension/languageserver + - cd extensions/theia/ + - yarn install + - cd $TRAVIS_BUILD_DIR + - docker build extensions/. -t yakindu/solidity-ide deploy: skip_cleanup: true on: From f3386f1c963a5b9fec7b0e5a8488630b99715d81 Mon Sep 17 00:00:00 2001 From: Jonathan Thoene Date: Tue, 1 Sep 2020 13:23:30 +0200 Subject: [PATCH 04/16] 2019-06 target should not mirror --- releng/com.yakindu.solidity.releng/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/releng/com.yakindu.solidity.releng/pom.xml b/releng/com.yakindu.solidity.releng/pom.xml index 4c1c34eb..b4a706d6 100644 --- a/releng/com.yakindu.solidity.releng/pom.xml +++ b/releng/com.yakindu.solidity.releng/pom.xml @@ -75,6 +75,7 @@ 2.18.0 + true From 53b2e65db42b9d39f2eb273f81921779fa5aff3f Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 13:48:38 +0200 Subject: [PATCH 05/16] Update .travis.yml --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fe0f2d8..9b23d103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,14 +24,16 @@ env: - TERM=dumb matrix: include: - - env: TARGET=2019-06.target - if: branch = master + - env: + -TARGET=2019-06.target + if: branch = master + -MIRROR=-Dtycho.disableP2Mirrors=true - env: TARGET=Latest.target before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests + - mvn clean verify -P$TARGET,tests $MIRROR - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode From 4f00888aac66570041a84200eeb4d9c3e8fabc3b Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 13:59:29 +0200 Subject: [PATCH 06/16] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b23d103..e6796f3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,11 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb + - MIRROR=-Dtycho.disableP2Mirrors=true matrix: include: - - env: - -TARGET=2019-06.target + - env: TARGET=2019-06.target if: branch = master - -MIRROR=-Dtycho.disableP2Mirrors=true - env: TARGET=Latest.target before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew From 575f0afe73dfbd7d566eda6d21ef343851a9ea00 Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:21:15 +0200 Subject: [PATCH 07/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e6796f3d..008caaa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb - - MIRROR=-Dtycho.disableP2Mirrors=true + - MIRROR="-Dtycho.disableP2Mirrors=true" matrix: include: - env: TARGET=2019-06.target From 61049e8802ba6a800f8a81a2ee250c8e4bf621da Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:24:00 +0200 Subject: [PATCH 08/16] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 008caaa0..f11722d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb - - MIRROR="-Dtycho.disableP2Mirrors=true" + - MIRROR=" -Dtycho.disableP2Mirrors=true" matrix: include: - env: TARGET=2019-06.target @@ -32,7 +32,7 @@ before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests $MIRROR + - mvn clean verify -P$TARGET,tests$MIRROR - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode From 130f5b278ba0b181cbb7a9b22335b9fbd5ec4e13 Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:25:42 +0200 Subject: [PATCH 09/16] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f11722d5..db7b33cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ env: - DISPLAY=:99.0 - MAVEN_OPTS="-Xmx4g" - TERM=dumb - - MIRROR=" -Dtycho.disableP2Mirrors=true" matrix: include: - env: TARGET=2019-06.target @@ -32,7 +31,7 @@ before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests$MIRROR + - mvn clean verify -P$TARGET,tests -Dtycho.disableP2Mirrors=true - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode From 11eef2f2b01d0561da6080ab6b4152835e3cd1e4 Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:30:12 +0200 Subject: [PATCH 10/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db7b33cf..a962d71f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests -Dtycho.disableP2Mirrors=true + - mvn clean verify -P$TARGET,tests - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode From 49922cffc129f0ec86f82351b15eba5461e22cc1 Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:36:14 +0200 Subject: [PATCH 11/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a962d71f..4fe0f2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: matrix: include: - env: TARGET=2019-06.target - if: branch = master + if: branch = master - env: TARGET=Latest.target before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew From d2d3617d9d1634d44affc9a8c5b3ba15cb1da4aa Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 14:47:55 +0200 Subject: [PATCH 12/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4fe0f2d8..a88b3462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: script: - cd releng/com.yakindu.solidity.releng - mvn clean verify -P$TARGET,tests - - cd ../com.yakindu.solidity.repository/target + - cd ../com.yakindu.solidity.repository/target -Dtycho.disableP2Mirrors=true - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode - ./gradlew vscodeExtension From c12cc5c62fe3b78d89b5f8389854b87210f726c8 Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 15:11:51 +0200 Subject: [PATCH 13/16] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a88b3462..58fd5d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests - - cd ../com.yakindu.solidity.repository/target -Dtycho.disableP2Mirrors=true + - mvn clean verify -P$TARGET,tests -Dtycho.disableP2Mirrors=true + - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode - ./gradlew vscodeExtension From af1da279f92d60d956e6c6c006d03ff1280a1b3b Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 15:30:55 +0200 Subject: [PATCH 14/16] Making mvn call depending on target --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58fd5d57..141ff5e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,14 +24,14 @@ env: - TERM=dumb matrix: include: - - env: TARGET=2019-06.target + - env: MVNCALL="mvn clean verify -P2019-06.target,tests -Dtycho.disableP2Mirrors=true" if: branch = master - - env: TARGET=Latest.target + - env: MVNCALL="mvn clean verify -PLatest.target,tests -Dtycho.disableP2Mirrors=true" before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - mvn clean verify -P$TARGET,tests -Dtycho.disableP2Mirrors=true + - $MVNCALL - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode From 9ef95eee845069548ac6e11027d4412a8c67db7a Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 15:44:14 +0200 Subject: [PATCH 15/16] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 141ff5e4..07541ad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: include: - env: MVNCALL="mvn clean verify -P2019-06.target,tests -Dtycho.disableP2Mirrors=true" if: branch = master - - env: MVNCALL="mvn clean verify -PLatest.target,tests -Dtycho.disableP2Mirrors=true" + - env: MVNCALL="mvn clean verify -PLatest.target,tests" before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: From 5acb15d84ebff48cf0f6a001249cb8e8a8a8a20f Mon Sep 17 00:00:00 2001 From: jthoene Date: Tue, 1 Sep 2020 15:55:14 +0200 Subject: [PATCH 16/16] Always disable P2 mirrors --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07541ad4..58fd5d57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,14 +24,14 @@ env: - TERM=dumb matrix: include: - - env: MVNCALL="mvn clean verify -P2019-06.target,tests -Dtycho.disableP2Mirrors=true" + - env: TARGET=2019-06.target if: branch = master - - env: MVNCALL="mvn clean verify -PLatest.target,tests" + - env: TARGET=Latest.target before_install: - chmod +x $TRAVIS_BUILD_DIR/extensions/vscode/gradlew script: - cd releng/com.yakindu.solidity.releng - - $MVNCALL + - mvn clean verify -P$TARGET,tests -Dtycho.disableP2Mirrors=true - cd ../com.yakindu.solidity.repository/target - zip -r repository.zip repository - cd $TRAVIS_BUILD_DIR/extensions/vscode