Dropped stages and use one continous flow

winder · Oct 1, 2020 · 5bfaa89 · 5bfaa89
1 parent c4331e3
commit 5bfaa89
Showing 1 changed file with 26 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,51 +22,33 @@ before_script:
 - sudo apt-get install -qq curl
 - curl -fL https://getcli.jfrog.io | sh
 
-stages:
-  - name: build
-  - name: deploy_snapshot
-    if: branch = master AND tag IS blank
-  - name: deploy_release
-    if: tag IS present
+script:
+  - mvn test install -B -Djava.util.logging.config.file=scripts/logging.config
+  - codecov
+  # Make sure artifacts can be built
+  - mvn package -pl ugs-classic assembly:assembly -DskipTests=true
+  - mvn package -pl ugs-platform/application -P create-autoupdate -DskipTests=true
+  - mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true
+  - mvn package -pl ugs-platform/application -P create-win-package -DskipTests=true
+  - mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true
+  - mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true
 
-jobs:
-  include:
-    - stage: build
-      name: "Build and test"
-      script:
-        - mvn test install -B -Djava.util.logging.config.file=scripts/logging.config
-        - codecov
-    - stage: deploy_snapshot
-      name: "Package and deploy snapshot"
-      script:
-        - mvn package -pl ugs-classic assembly:assembly -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-autoupdate -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-win-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true
-      deploy:
-        # Only deploy to a specific branch.
-        - provider: script
-          script: bash scripts/deploy.sh nightly
-          skip_cleanup: true
-
-    - stage: deploy_release
-      name: "Package and deploy release"
-      script:
-        - mvn package -pl ugs-classic assembly:assembly -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-autoupdate -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-win-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true
-        - mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true
-      deploy:
-        # Only deploy to a specific branch.
-        - provider: script
-          script: bash scripts/deploy.sh $TRAVIS_TAG
-          skip_cleanup: true
-          on:
-            tags: true
+
+deploy:
+  # Only deploy as nightly if master branch without tag
+  - provider: script
+    script: bash scripts/deploy.sh nightly
+    skip_cleanup: true
+    on:
+      branch: master
+      tags: false
+
+  # Only deploy as release when tagged
+  - provider: script
+    script: bash scripts/deploy.sh $TRAVIS_TAG
+    skip_cleanup: true
+    on:
+      tags: true
 
 env:
   global: