Merge pull request #5 from elpete/add-adobe-2018-to-ci

Add Adobe 2018 to Travis CI

.travis.yml

@@ -1,100 +1,71 @@
 language: java
-
-notifications:
-  slack:
-    secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
-
-env:
-  global:
-    - MODULE_ID=cbmarkdown
-  matrix:
-    - [email protected]
-    - ENGINE=lucee@5
-    - ENGINE=adobe@11
-    - ENGINE=adobe@2016
-
-branches:
-  only:
-  - development
-  - master
-
+notifications: 
+   slack: 
+      secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
+env: 
+   global: 
+   - MODULE_ID=cbmarkdown
+   matrix: 
+   - ENGINE=lucee@5
+   - [email protected]
+   - ENGINE=adobe@2018
+   - ENGINE=adobe@2016
+   - ENGINE=adobe@11
+branches: 
+   only: 
+   - development
+   - master
 dist: trusty
-
 sudo: required
-
-before_install:
-  # CommandBox Keys
-  - sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
-  - sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
-    /etc/apt/sources.list.d/commandbox.list
-
-install:
-  # Install Commandbox
-  - sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
-  # Test that the box binary is available and ready for our tests
-  - box version
-  # If using auto-publish, you will need to provide your API token with this line:
-  - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
-  # Setup for our tests
-  - mkdir tests/results
-  - sudo chmod -R 775 tests/results
-
-# Build script - note module versioning is passed to ANT
-script:
-  # run our dependency install to ensure the workbench is in place
-  - box install
-  # add our module-specific build properties
-  - printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
-  - printf "\ncfengine=$ENGINE" >> workbench/build.properties
-  # execute our build
-  - ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
-
-after_failure:
-  - cd $TRAVIS_BUILD_DIR
-  # Display the contents of our root directory
-  # Spit out our Commandbox log in case we need to debug
-  - box server log name=$ENGINE
-  - cat `box system-log`
-
-# Only executed when merging to master 
-before_deploy:
-  - cd $TRAVIS_BUILD_DIR
-  - mkdir -p s3deploy
-  - rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
-  - rm -f ./s3deploy/box-repo.json
-
-deploy:
-  #Module Deployment
-  - provider: s3
-    on:
+before_install: 
+- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
+- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list
+install: 
+- sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
+- box version
+- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
+- mkdir tests/results
+- sudo chmod -R 775 tests/results
+script: 
+- box install
+- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
+- printf "\ncfengine=$ENGINE" >> workbench/build.properties
+- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
+after_failure: 
+- cd $TRAVIS_BUILD_DIR
+- box server log name=$ENGINE
+- cat `box system-log`
+before_deploy: 
+- cd $TRAVIS_BUILD_DIR
+- mkdir -p s3deploy
+- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
+- rm -f ./s3deploy/box-repo.json
+deploy: 
+-  provider: s3
+   on: 
       branch: 
-        - master
-        - development
-      condition: "$ENGINE = [email protected]"
-    skip_cleanup: true
-    #AWS Credentials need to be set in Travis
-    access_key_id: $AWS_ACCESS_KEY
-    secret_access_key: $AWS_ACCESS_SECRET
-    bucket: "downloads.ortussolutions.com"
-    local-dir: s3deploy
-    upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
-    acl: public_read
-  #API Docs Deployment
-  - provider: s3
-    on:
+      - master
+      - development
+      condition: $ENGINE = [email protected]
+   skip_cleanup: true
+   access_key_id: $AWS_ACCESS_KEY
+   secret_access_key: $AWS_ACCESS_SECRET
+   bucket: downloads.ortussolutions.com
+   local-dir: s3deploy
+   upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
+   acl: public_read
+-  provider: s3
+   on: 
       branch: 
-        - master
-        - development
-      condition: "$ENGINE = [email protected]"
-    skip_cleanup: true
-    #AWS Credentials need to be set in Travis
-    access_key_id: $AWS_ACCESS_KEY
-    secret_access_key: $AWS_ACCESS_SECRET
-    bucket: "apidocs.ortussolutions.com"
-    local-dir: build/apidocs
-    upload-dir: coldbox-modules/$MODULE_ID
-    acl: public_read
-
-
-after_deploy:
-  - cd $TRAVIS_BUILD_DIR/build && box forgebox publish
+      - master
+      - development
+      condition: $ENGINE = [email protected]
+   skip_cleanup: true
+   access_key_id: $AWS_ACCESS_KEY
+   secret_access_key: $AWS_ACCESS_SECRET
+   bucket: apidocs.ortussolutions.com
+   local-dir: build/apidocs
+   upload-dir: coldbox-modules/$MODULE_ID
+   acl: public_read
+after_deploy: 
+- cd $TRAVIS_BUILD_DIR/build && box forgebox publish

tests/test.properties

@@ -2,4 +2,5 @@ [email protected]=http://127.0.0.1:50680/tests/runner.cfm?
 url.runners.lucee@5=http://127.0.0.1:50685/tests/runner.cfm?
 url.runners.adobe@10=http://127.0.0.1:49610/tests/runner.cfm?
 url.runners.adobe@11=http://127.0.0.1:49611/tests/runner.cfm?
-url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?
+url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?
+url.runners.adobe@2018=http://127.0.0.1:49616/tests/runner.cfm?