diff --git a/.drone.yml b/.drone.yml index 6848968..10cba54 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,6 @@ +workspace: + path: /go/src/github.com/appleboy/gorush + pipeline: # restore the cache from an sftp server restore_cache: @@ -21,7 +24,7 @@ pipeline: when: status: [ success, failure ] matrix: - GO_VERSION: 1.7.3 + GO_VERSION: 1.7.4 gtalk: image: appleboy/drone-gtalk @@ -30,7 +33,7 @@ pipeline: when: status: [ success, failure ] matrix: - GO_VERSION: 1.7.3 + GO_VERSION: 1.7.4 facebook: image: appleboy/drone-facebook @@ -39,7 +42,7 @@ pipeline: when: status: [ success, failure ] matrix: - GO_VERSION: 1.7.3 + GO_VERSION: 1.7.4 telegram: image: appleboy/drone-telegram @@ -48,7 +51,7 @@ pipeline: when: status: [ success, failure ] matrix: - GO_VERSION: 1.7.3 + GO_VERSION: 1.7.4 # rebuild the cache on the sftp server rebuild_cache: @@ -59,16 +62,13 @@ pipeline: when: branch: master matrix: - GO_VERSION: 1.7.3 + GO_VERSION: 1.7.4 services: redis: image: redis:alpine -workspace: - path: /go/src/github.com/appleboy/gorush - matrix: GO_VERSION: - - 1.7.3 - - 1.6.3 + - 1.7.4 + - 1.6.4 diff --git a/.travis.yml b/.travis.yml index c20aedc..ca42af0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,8 @@ services: - docker go: - - 1.5.4 - - 1.6.3 - - 1.7.3 + - 1.6.4 + - 1.7.4 - tip cache: @@ -39,13 +38,13 @@ script: after_success: - bash <(curl -s https://codecov.io/bash) -f .cover/coverage.txt - # deploy from master - - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; - make docker_deploy tag=latest; - fi - # deploy from tag - - if [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; - make docker_deploy tag=$TRAVIS_TAG; - fi + # # deploy from master + # - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + # docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; + # make docker_deploy tag=latest; + # fi + # # deploy from tag + # - if [ "$TRAVIS_GO_VERSION" == "1.7.3" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then + # docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; + # make docker_deploy tag=$TRAVIS_TAG; + # fi diff --git a/gorush/notification.go b/gorush/notification.go index 7169f56..f7433ab 100644 --- a/gorush/notification.go +++ b/gorush/notification.go @@ -287,7 +287,7 @@ func iosAlertDictionary(payload *payload.Payload, req PushNotification) *payload // GetIOSNotification use for define iOS notificaiton. // 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 { notification := &apns.Notification{ ApnsID: req.ApnsID,