coopgo-platform
/
gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

update testing to 1.7.4 and 1.6.4 

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
Bo-Yi Wu 2016-12-07 15:43:17 +08:00
parent 4b10396093
commit 711a25eb6d
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.drone.yml
View File

@ -1,3 +1,6 @@
workspace:
path: /go/src/github.com/appleboy/gorush
pipeline: pipeline:
# restore the cache from an sftp server # restore the cache from an sftp server
restore_cache: restore_cache:
@ -21,7 +24,7 @@ pipeline:
when: when:
status: [ success, failure ] status: [ success, failure ]
matrix: matrix:
GO_VERSION: 1.7.3 GO_VERSION: 1.7.4
gtalk: gtalk:
image: appleboy/drone-gtalk image: appleboy/drone-gtalk
@ -30,7 +33,7 @@ pipeline:
when: when:
status: [ success, failure ] status: [ success, failure ]
matrix: matrix:
GO_VERSION: 1.7.3 GO_VERSION: 1.7.4
facebook: facebook:
image: appleboy/drone-facebook image: appleboy/drone-facebook
@ -39,7 +42,7 @@ pipeline:
when: when:
status: [ success, failure ] status: [ success, failure ]
matrix: matrix:
GO_VERSION: 1.7.3 GO_VERSION: 1.7.4
telegram: telegram:
image: appleboy/drone-telegram image: appleboy/drone-telegram
@ -48,7 +51,7 @@ pipeline:
when: when:
status: [ success, failure ] status: [ success, failure ]
matrix: matrix:
GO_VERSION: 1.7.3 GO_VERSION: 1.7.4
# rebuild the cache on the sftp server # rebuild the cache on the sftp server
rebuild_cache: rebuild_cache:
@ -59,16 +62,13 @@ pipeline:
when: when:
branch: master branch: master
matrix: matrix:
GO_VERSION: 1.7.3 GO_VERSION: 1.7.4
services: services:
redis: redis:
image: redis:alpine image: redis:alpine
workspace:
path: /go/src/github.com/appleboy/gorush
matrix: matrix:
GO_VERSION: GO_VERSION:
- 1.7.3 - 1.7.4
- 1.6.3 - 1.6.4

25
.travis.yml
View File

@ -6,9 +6,8 @@ services:
- docker - docker
go: go:
- 1.5.4 - 1.6.4
- 1.6.3 - 1.7.4
- 1.7.3
- tip - tip
cache: cache:
@ -39,13 +38,13 @@ script:
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) -f .cover/coverage.txt - bash <(curl -s https://codecov.io/bash) -f .cover/coverage.txt
# deploy from master # # deploy from master
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then # - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; # docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
make docker_deploy tag=latest; # make docker_deploy tag=latest;
fi # fi
# deploy from tag # # deploy from tag
- if [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then # - if [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; # docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
make docker_deploy tag=$TRAVIS_TAG; # make docker_deploy tag=$TRAVIS_TAG;
fi # fi

2
gorush/notification.go
View File

@ -287,7 +287,7 @@ func iosAlertDictionary(payload *payload.Payload, req PushNotification) *payload
// GetIOSNotification use for define iOS notificaiton. // GetIOSNotification use for define iOS notificaiton.
// The iOS Notification Payload // The iOS Notification Payload
// ref: https://developer.apple.com/library/ios/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/Chapters/TheNotificationPayload.html // ref: https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/PayloadKeyReference.html#//apple_ref/doc/uid/TP40008194-CH17-SW1
func GetIOSNotification(req PushNotification) *apns.Notification { func GetIOSNotification(req PushNotification) *apns.Notification {
notification := &apns.Notification{ notification := &apns.Notification{
ApnsID: req.ApnsID, ApnsID: req.ApnsID,