Skip to content

Commit de7d98a

Browse files
authored
Merge pull request #96 from wagnert/1.1
Update Travis-CI configuration
2 parents 7f7748b + b557117 commit de7d98a

5 files changed

Lines changed: 48 additions & 8 deletions

File tree

.travis.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
1-
language: php
1+
os: osx
2+
3+
osx_image: xcode6.4
4+
5+
env:
6+
global:
7+
- BUILD_NUMBER=${TRAVIS_BUILD_NUMBER}
28

39
before_install:
4-
- wget https://scrutinizer-ci.com/ocular.phar
5-
10+
- brew update
11+
- brew install ant
12+
613
script:
714
- sudo chown $USER /opt
8-
- ant build
9-
- php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml
15+
- ant dependencies-init
16+
- ant local-build -Dos.family=mac
17+
18+
deploy:
19+
provider: releases
20+
api_key:
21+
secure: lgqc8VZI7GcenyFh3udW67a9FGXfR4GUoaOV77nl17JB3+8CMpXmFozCECaXZFe6Bek9kr7wzIy68LJvR/GoIoFMmEiHRAzuE8+0eg7gpN0D+N/IlEUWU7AyKdL+7Ad1GrpQuulJIJNPgBkzcbVhKQnq5kFYog+SEFyl4s0aVF4=
22+
file_glob: true
23+
file: "build/*"
24+
skip_cleanup: true
25+
on:
26+
tags: true
27+
branch: '1.1'
28+
repo: appserver-io-php/runtime
1029

1130
notifications:
1231
email: tw@techdivision.com
13-
hipchat: 95d47a72c5372d4a0fef20048c3200@Appserver
32+
hipchat: 95d47a72c5372d4a0fef20048c3200@Appserver

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# Version 1.1.10
2+
3+
## Bugfixes
4+
5+
* None
6+
7+
## Features
8+
9+
* Switch to Travis-CI build process
10+
* Switch to PHP 5.6.38
11+
12+
# Version 1.1.9
13+
14+
## Bugfixes
15+
16+
* None
17+
18+
## Features
19+
20+
* Switch to PHP 5.6.35
21+
122
# Version 1.1.8
223

324
## Bugfixes

build.default.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#--------------------------------------------------------------------------------
1010

1111
# ---- Module Release Settings --------------------------------------------------
12-
release.version = 1.1.9
12+
release.version = 1.1.10
1313

1414
# ---- Default Operating System -------------------------------------------------
1515
os.family = linux
@@ -28,7 +28,7 @@ build.number = ${env.BUILD_NUMBER}
2828

2929
# ---- ApplicationServer Compile Settings ---------------------------------------
3030
runtime.php.major-version = 5.6
31-
runtime.php.version = ${runtime.php.major-version}.35
31+
runtime.php.version = ${runtime.php.major-version}.38
3232
runtime.php.run-tests = false
3333
runtime.ext-appserver.version = 1.0.1
3434
runtime.pthreads.version = 2.0.10

0 commit comments

Comments
 (0)