Merge 8909a76 into b5dba60

LorenzoBettini · Feb 3, 2020 · fe97863 · fe97863
2 parents b5dba60 + 8909a76
commit fe97863
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,6 +45,7 @@ before_script:
 # Build on MacOSX is triggered only for pull requests and merge of pull requests
 script:
  - export
+ - ./mvnw -f edelta.parent/pom.xml -N -Dtycho.mode=maven help:active-profiles
  - ./mvnw -f edelta.parent/pom.xml -U clean verify $ADDITIONAL
 
 before_cache:
@@ -53,6 +54,6 @@ before_cache:
 after_success:
  - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log"
 
-after_failure:
+#after_failure:
 # - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \;
- - find ./edelta.parent/*/target/it/ -name "*.log" -exec cat {} \;
+# - find ./edelta.parent/*/target/it/ -name "*.log" -exec cat {} \;
diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml
@@ -17,7 +17,7 @@
 
   <profiles>
     <profile>
-      <id>testing-on-mac</id>
+      <id>macos</id>
       <activation>
         <os>
           <family>mac</family>
@@ -31,14 +31,8 @@
             <configuration>
               <dependency-resolution>
                 <extraRequirements combine.children="append">
-                  <!-- We specify our feature so that we're sure we're using 
-                    also all the required software -->
-                  <requirement>
-                    <type>eclipse-feature</type>
-                    <id>edelta.feature</id>
-                    <versionRange>0.0.0</versionRange>
-                  </requirement>
-                  <!-- See https://github.com/LorenzoBettini/jbase/issues/3 
+                  <!-- This allows us to take the fragment org.eclipse.jdt.launching.macosx
+                    See https://github.com/LorenzoBettini/jbase/issues/3 
                     https://www.eclipse.org/forums/index.php/t/1073366/ -->
                   <requirement>
                     <type>eclipse-feature</type>
@@ -52,39 +46,28 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>testing-NOT-on-mac</id>
-      <activation>
-        <os>
-          <family>!mac</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <configuration>
-              <dependency-resolution>
-                <extraRequirements combine.children="append">
-                  <!-- We specify our feature so that we're sure we're using 
-                    also all the required software -->
-                  <requirement>
-                    <type>eclipse-feature</type>
-                    <id>edelta.feature</id>
-                    <versionRange>0.0.0</versionRange>
-                  </requirement>
-                </extraRequirements>
-              </dependency-resolution>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements
+              combine.children="append">
+              <!-- We specify our feature so that we're sure we're using 
+                also all the required software -->
+              <requirement>
+                <type>eclipse-feature</type>
+                <id>edelta.feature</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.xtend</groupId>
         <artifactId>xtend-maven-plugin</artifactId>