Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2019-04-02 11:30:08 +0000
committerJan Belle2019-04-02 14:11:28 +0000
commitd941d5a98db578e4bff2c284b06a498f1aab1c23 (patch)
tree80f8256a3c51dab667a1a8a62d4fae68fd9b6400
parentaf478656675a88011db86ea5a8bfd645e6c63d00 (diff)
downloadorg.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.tar.gz
org.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.tar.xz
org.eclipse.etrice-d941d5a98db578e4bff2c284b06a498f1aab1c23.zip
[releng] Migrate to new ci infrastructure
* promote artifacts via scp * increase xtext version to 2.15 Bug 545353 Change-Id: If8f0ab65f52970833861267792ab3b15e8fa07af
-rw-r--r--gradle/versions.gradle2
-rw-r--r--plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java2
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java10
-rw-r--r--plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java18
-rw-r--r--releng/org.eclipse.etrice.parent/pom.xml4
-rw-r--r--releng/org.eclipse.etrice.releng/build.gradle47
6 files changed, 62 insertions, 21 deletions
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index adcd688be..72fcd382e 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -1,7 +1,7 @@
ext.versions = [
'guava' : '21.0',
- 'xtext' : '2.12.0',
+ 'xtext' : '2.15.0',
'core_runtime' : '3.12.0',
'core_resources' : '3.11.1',
'commons_io' : '2.5'
diff --git a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
index fc1519aed..56b6bd295 100644
--- a/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.config/src-gen/org/eclipse/etrice/core/serializer/ConfigSyntacticSequencer.java
@@ -82,7 +82,7 @@ public class ConfigSyntacticSequencer extends AbstractSyntacticSequencer {
/**
* Ambiguous syntax:
- * 'conjugated' | 'conjugate'
+ * 'conjugate' | 'conjugated'
*
* This ambiguous syntax occurs at:
* conjugated=PortClassConfig (ambiguity) conjugated=PortClassConfig
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
index 4b546beb6..ae7f2142a 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/serializer/RoomSemanticSequencer.java
@@ -374,24 +374,24 @@ public class RoomSemanticSequencer extends FSMSemanticSequencer {
* docu=Documentation?
* base=[ActorClass|FQN]?
* annotations+=Annotation*
- * serviceProvisionPoints+=SPP?
- * (interfacePorts+=Port? serviceProvisionPoints+=SPP?)*
+ * interfacePorts+=Port?
+ * (serviceProvisionPoints+=SPP? interfacePorts+=Port?)*
* structureDocu=Documentation?
* userCode1=DetailCode?
* userCode2=DetailCode?
* userCode3=DetailCode?
- * attributes+=Attribute?
+ * connections+=LayerConnection?
* (
* (
- * connections+=LayerConnection |
* bindings+=Binding |
* serviceImplementations+=ServiceImplementation |
+ * attributes+=Attribute |
* actorRefs+=ActorRef |
* serviceAccessPoints+=SAP |
* internalPorts+=Port |
* externalPorts+=ExternalPort
* )?
- * attributes+=Attribute?
+ * connections+=LayerConnection?
* )*
* behaviorDocu=Documentation?
* behaviorAnnotations+=Annotation*
diff --git a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
index 730e723fd..434eae9bc 100644
--- a/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
+++ b/plugins/org.eclipse.etrice.core.room/src-gen/org/eclipse/etrice/core/services/RoomGrammarAccess.java
@@ -1777,7 +1777,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.ModelComponent");
private final RuleCall cActorClassParserRuleCall = (RuleCall)rule.eContents().get(1);
- //@ Override ModelComponent:
+ //@Override
+ //ModelComponent:
// ActorClass;
@Override public ParserRule getRule() { return rule; }
@@ -3194,7 +3195,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.etrice.core.Room.AbstractInterfaceItem");
private final RuleCall cInterfaceItemParserRuleCall = (RuleCall)rule.eContents().get(1);
- //@ Override AbstractInterfaceItem:
+ //@Override
+ //AbstractInterfaceItem:
// InterfaceItem;
@Override public ParserRule getRule() { return rule; }
@@ -3254,7 +3256,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
private final Keyword cTransitionKeyword_10 = (Keyword)cAlternatives.eContents().get(10);
private final Keyword cRoomModelKeyword_11 = (Keyword)cAlternatives.eContents().get(11);
- //@ Override AnnotationTargetType:
+ //@Override
+ //AnnotationTargetType:
// 'DataClass' |
// 'ActorClass' |
// 'ActorBehavior' |
@@ -3998,7 +4001,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getOutMessageHandlerAccess().getRule();
}
- //@ Override ModelComponent:
+ //@Override
+ //ModelComponent:
// ActorClass;
public ModelComponentElements getModelComponentAccess() {
return pModelComponent;
@@ -4279,7 +4283,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getReferenceTypeAccess().getRule();
}
- //@ Override AbstractInterfaceItem:
+ //@Override
+ //AbstractInterfaceItem:
// InterfaceItem;
public AbstractInterfaceItemElements getAbstractInterfaceItemAccess() {
return pAbstractInterfaceItem;
@@ -4303,7 +4308,8 @@ public class RoomGrammarAccess extends AbstractGrammarElementFinder {
return getMULTIPLICITYAccess().getRule();
}
- //@ Override AnnotationTargetType:
+ //@Override
+ //AnnotationTargetType:
// 'DataClass' |
// 'ActorClass' |
// 'ActorBehavior' |
diff --git a/releng/org.eclipse.etrice.parent/pom.xml b/releng/org.eclipse.etrice.parent/pom.xml
index ebd4060c9..3e8f801f2 100644
--- a/releng/org.eclipse.etrice.parent/pom.xml
+++ b/releng/org.eclipse.etrice.parent/pom.xml
@@ -22,8 +22,8 @@
<properties>
<project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
- <xtext.version>2.12.0</xtext.version>
- <tycho.version>1.1.0</tycho.version>
+ <xtext.version>2.15.0</xtext.version>
+ <tycho.version>1.3.0</tycho.version>
<cbi.version>1.1.4</cbi.version>
<eclipse.url>http://download.eclipse.org/releases/oxygen</eclipse.url>
diff --git a/releng/org.eclipse.etrice.releng/build.gradle b/releng/org.eclipse.etrice.releng/build.gradle
index 3e75a363e..d423e0cca 100644
--- a/releng/org.eclipse.etrice.releng/build.gradle
+++ b/releng/org.eclipse.etrice.releng/build.gradle
@@ -1,3 +1,7 @@
+plugins {
+ id 'org.hidetake.ssh' version '2.10.1'
+}
+
configurations {
archives
updates
@@ -12,21 +16,52 @@ dependencies {
updates project(path: ':releng:org.eclipse.etrice.site', configuration: 'archive')
}
-
-def downloadDir = '/home/data/httpd/download.eclipse.org/etrice'
-// downloadDir = "$buildDir/download"
+def isSnapshot = version.endsWith('SNAPSHOT')
def versionDir = version
-if(version.endsWith('SNAPSHOT')) {
+if(isSnapshot) {
versionDir = 'nightly'
}
+def downloadDir = '/home/data/httpd/download.eclipse.org/etrice'
def promoteDir = "$downloadDir/$versionDir"
+def assembleDir = "$buildDir/$versionDir"
-task promote(type: Sync) {
+remotes {
+ projectsStorage {
+ host = 'projects-storage.eclipse.org'
+ user = 'genie.etrice'
+ }
+}
+
+ssh.settings {
+ agent = true
+ fileTransfer = 'scp'
+}
+
+task assembleArtifacts(type: Sync) {
from([configurations.archives, configurations.updates]) {
into 'archives'
}
from(zipTree(configurations.updates.singleFile)) {
into 'updates'
}
- into promoteDir
+ into assembleDir
+}
+
+task promote {
+ dependsOn assembleArtifacts
+ doLast {
+ ssh.run {
+ session(remotes.projectsStorage) {
+ logger.info "clean download area"
+ remove promoteDir
+ execute "mkdir $promoteDir"
+
+ logger.info "promote archives"
+ put from: "$assembleDir/archives", into: promoteDir
+
+ logger.info "promote update site"
+ put from: "$assembleDir/updates", into: promoteDir
+ }
+ }
+ }
} \ No newline at end of file

Back to the top