update travis config for lts

emberjs · Oct 12, 2018 · 7dccaf8 · 7dccaf8
1 parent 12d44ae
commit 7dccaf8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,8 @@ branches:
     - master
     - beta
     - release
-    # release branches
-    - /^release-.*/
+    # release and LTS branches
+    - /^(release|lts)-.*/
     # npm version tags
     - /^v\d+\.\d+\.\d+/
 
@@ -27,7 +27,7 @@ stages:
   - additional tests
   - ember version tests
   - name: external partner tests
-    if: NOT (branch ~= /^release.*/)
+    if: NOT (branch ~= /^(release|lts).*/)
   - name: deploy
     if: type = push AND (branch IN (master, beta, release) OR tag IS present)
 
@@ -38,7 +38,7 @@ jobs:
     # runs tests with current locked deps and linting
     - stage: test
       name: "Linting"
-      if: NOT (branch ~= /^release.*/)
+      if: NOT (branch ~= /^(release|lts).*/)
       script:
         - ./bin/lint-features
         - yarn lint:js
@@ -47,7 +47,7 @@ jobs:
 
     - stage: additional tests
       name: "Optional Features"
-      if: NOT (branch ~= /^release.*/)
+      if: NOT (branch ~= /^(release|lts).*/)
       install: yarn install
       script: yarn test:optional-features
 
@@ -70,18 +70,18 @@ jobs:
 
     # runs tests against each supported Ember version
     - stage: ember version tests
-      name: "Ember LTS 2.16"
-      env: EMBER_TRY_SCENARIO=ember-lts-2.16
-    - name: "Ember LTS 2.18"
+      name: "Ember LTS 2.18"
       env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - name: "Ember LTS 3.4"
+      env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - name: "Ember Release"
-      if: NOT (branch ~= /^release.*/)
+      if: NOT (branch ~= /^(release|lts).*/)
       env: EMBER_TRY_SCENARIO=ember-release
     - name: "Ember Beta"
-      if: NOT (branch ~= /^release.*/)
+      if: NOT (branch ~= /^(release|lts).*/)
       env: EMBER_TRY_SCENARIO=ember-beta
     - name: "Ember Canary"
-      if: NOT (branch ~= /^release.*/)
+      if: NOT (branch ~= /^(release|lts).*/)
       env: EMBER_TRY_SCENARIO=ember-canary
 
     # runs tests against various open-source projects for early-warning regression analysis

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -17,18 +17,18 @@ module.exports = function() {
           npm: {},
         },
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-2.18',
           npm: {
             devDependencies: {
-              'ember-source': '~2.16.0',
+              'ember-source': '~2.18.0',
             },
           },
         },
         {
-          name: 'ember-lts-2.18',
+          name: 'ember-lts-3.4',
           npm: {
             devDependencies: {
-              'ember-source': '~2.18.0',
+              'ember-source': '~3.4.0',
             },
           },
         },