Skip to content

Commit e79be3c

Browse files
elpeteelpete
authored
Merge pull request #3 from elpete/add-adobe-2018-to-ci
Add Adobe 2018 to Travis CI
2 parents da2f189 + 2fd0d2a commit e79be3c

File tree

3 files changed

+71
-97
lines changed

3 files changed

+71
-97
lines changed

‎.travis.yml‎

Lines changed: 67 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,72 @@
11
language: java
2-
3-
notifications:
4-
slack:
5-
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=
6-
7-
env:
8-
global:
9-
- MODULE_ID=swagger-sdk
10-
matrix:
11-
- [email protected]
12-
- ENGINE=lucee@5
13-
- ENGINE=adobe@10
14-
- ENGINE=adobe@11
15-
- ENGINE=adobe@2016
16-
17-
branches:
18-
only:
19-
- development
20-
- master
21-
2+
notifications:
3+
slack:
4+
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=
5+
env:
6+
global:
7+
- MODULE_ID=swagger-sdk
8+
matrix:
9+
- ENGINE=lucee@5
10+
- [email protected]
11+
- ENGINE=adobe@2018
12+
- ENGINE=adobe@2016
13+
- ENGINE=adobe@11
14+
- ENGINE=adobe@10
15+
branches:
16+
only:
17+
- development
18+
- master
2219
dist: trusty
23-
2420
sudo: required
25-
26-
before_install:
27-
# CommandBox Keys
28-
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
29-
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
30-
/etc/apt/sources.list.d/commandbox.list
31-
32-
install:
33-
# Install Commandbox
34-
- sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
35-
# Test that the box binary is available and ready for our tests
36-
- box version
37-
# If using auto-publish, you will need to provide your API token with this line:
38-
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
39-
# Setup for our tests
40-
- mkdir tests/results
41-
- sudo chmod -R 775 tests/results
42-
43-
# Build script - note module versioning is passed to ANT
44-
script:
45-
# run our dependency install to ensure the workbench is in place
46-
- box install
47-
# add our module-specific build properties
48-
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
49-
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
50-
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
51-
# execute our build
52-
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
53-
54-
after_failure:
55-
- cd $TRAVIS_BUILD_DIR
56-
# Spit out our Commandbox log in case we need to debug
57-
- box server log name=$ENGINE
58-
- cat `box system-log`
59-
60-
before_deploy:
61-
- cd $TRAVIS_BUILD_DIR
62-
- mkdir -p s3deploy
63-
- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
64-
- rm -f ./s3deploy/box-repo.json
65-
66-
deploy:
67-
#Module Deployment
68-
- provider: s3
69-
on:
21+
before_install:
22+
- curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
23+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list
24+
install:
25+
- sudo apt-get update && sudo apt-get --assume-yes install git haveged rsync commandbox
26+
- box version
27+
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
28+
- mkdir tests/results
29+
- sudo chmod -R 775 tests/results
30+
script:
31+
- box install
32+
- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
33+
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
34+
- printf "\ncfengine=$ENGINE" >> workbench/build.properties
35+
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
36+
after_failure:
37+
- cd $TRAVIS_BUILD_DIR
38+
- box server log name=$ENGINE
39+
- cat `box system-log`
40+
before_deploy:
41+
- cd $TRAVIS_BUILD_DIR
42+
- mkdir -p s3deploy
43+
- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
44+
- rm -f ./s3deploy/box-repo.json
45+
deploy:
46+
- provider: s3
47+
on:
7048
branch:
71-
- master
72-
- development
73-
condition: "$ENGINE = [email protected]"
74-
skip_cleanup: true
75-
#AWS Credentials need to be set in Travis
76-
access_key_id: $AWS_ACCESS_KEY
77-
secret_access_key: $AWS_ACCESS_SECRET
78-
bucket: "downloads.ortussolutions.com"
79-
local-dir: s3deploy
80-
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
81-
acl: public_read
82-
#API Docs Deployment
83-
- provider: s3
84-
on:
49+
- master
50+
- development
51+
condition: $ENGINE = [email protected]
52+
skip_cleanup: true
53+
access_key_id: $AWS_ACCESS_KEY
54+
secret_access_key: $AWS_ACCESS_SECRET
55+
bucket: downloads.ortussolutions.com
56+
local-dir: s3deploy
57+
upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
58+
acl: public_read
59+
- provider: s3
60+
on:
8561
branch:
86-
- master
87-
condition: "$ENGINE = [email protected]"
88-
skip_cleanup: true
89-
#AWS Credentials need to be set in Travis
90-
access_key_id: $AWS_ACCESS_KEY
91-
secret_access_key: $AWS_ACCESS_SECRET
92-
bucket: "apidocs.ortussolutions.com"
93-
local-dir: build/apidocs
94-
upload-dir: coldbox-modules/$MODULE_ID
95-
acl: public_read
96-
97-
98-
after_deploy:
99-
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
62+
- master
63+
condition: $ENGINE = [email protected]
64+
skip_cleanup: true
65+
access_key_id: $AWS_ACCESS_KEY
66+
secret_access_key: $AWS_ACCESS_SECRET
67+
bucket: apidocs.ortussolutions.com
68+
local-dir: build/apidocs
69+
upload-dir: coldbox-modules/$MODULE_ID
70+
acl: public_read
71+
after_deploy:
72+
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish

‎box.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"slug" : "SwaggerSDK-shell",
55
"private" : false,
66
"dependencies" : {
7-
"coldbox" : "4.1.0+00002",
7+
"coldbox" : "^4.1.0",
88
"cbjavaloader": ">1.0.0",
99
"workbench" : "git+https://github.com/Ortus-Solutions/unified-workbench.git"
1010
},
@@ -17,4 +17,4 @@
1717
"cbjavaloader": "modules/cbjavaloader",
1818
"workbench" : "workbench"
1919
}
20-
}
20+
}

‎tests/test.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ [email protected]=http://127.0.0.1:50680/tests/runner.cfm?
22
url.runners.lucee@5=http://127.0.0.1:50685/tests/runner.cfm?
33
url.runners.adobe@10=http://127.0.0.1:49610/tests/runner.cfm?
44
url.runners.adobe@11=http://127.0.0.1:49611/tests/runner.cfm?
5-
url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?
5+
url.runners.adobe@2016=http://127.0.0.1:49616/tests/runner.cfm?
6+
url.runners.adobe@2018=http://127.0.0.1:49616/tests/runner.cfm?

0 commit comments

Comments
 (0)