Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit 174ead4

Browse files
committed
Fixing travis config
1 parent 1ce36e5 commit 174ead4

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

.travis.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@ language: java
22
jdk:
33
- oraclejdk8
44
sudo: true
5-
before_install:
6-
- echo 'America/Los_Angeles' | sudo tee /etc/timezone
7-
- sudo dpkg-reconfigure --frontend noninteractive tzdata
8-
- chmod 755 ./shared/dev-tasks/*.sh
9-
- chmod 755 ./gradlew
105
install:
11-
- ./shared/dev-tasks/install-dependencies.sh
6+
- ./.travis/install-dependencies.sh
127
script:
13-
- ./shared/dev-tasks/run-tests.sh
14-
15-
#whitelist
8+
- ./.travis/run-tests.sh
169
branches:
1710
only:
1811
- master
19-
- dev
12+
- dev

.travis/install-dependencies.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
4+
./.travis/travis-install-ml.sh release
5+
./.travis/setup-marklogic.sh
6+
fi
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
22

33
if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
4-
cd ${TRAVIS_BUILD_DIR}
5-
./gradlew test -i
4+
./gradlew clean test -i
65
fi
File renamed without changes.

shared/dev-tasks/travis-install-ml.sh renamed to .travis/travis-install-ml.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ else
4545
# if the user passed a day string as a param then use it instead
4646
test $1 && day=$1
4747
# make a version number out of the date
48-
ver="9.0-$day"
48+
ver="8.0-$day"
4949

5050
echo "********* Downloading MarkLogic nightly $ver"
5151

@@ -56,7 +56,7 @@ else
5656
suff="_amd64.deb"
5757
fnamedeb=$fnamedeb$suff
5858

59-
url="https://root.marklogic.com/nightly/builds/linux64-rh7/rh7v-intel64-90-test-build.marklogic.com/b9_0/pkgs.$day/$fname"
59+
url="https://root.marklogic.com/nightly/builds/linux64/rh6-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
6060

6161
status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
6262
if [[ $status = 200 ]]; then

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

shared/dev-tasks/install-dependencies.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)