From 1f27e14399fff9031312d7abb8e2b2ce8e8b590a Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 6 Feb 2020 14:08:02 -0500 Subject: [PATCH 1/3] craft --- .craft.yml | 24 ++++++++++++++++++++++++ .travis.yml | 13 +++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .craft.yml diff --git a/.craft.yml b/.craft.yml new file mode 100644 index 000000000..0405d5285 --- /dev/null +++ b/.craft.yml @@ -0,0 +1,24 @@ +github: + owner: getsentry + repo: sentry-android + targets: + - name: bintray + - name: github + - name: registry + type: sdk + config: + canonical: "maven:sentry-android" + - name: registry + type: sdk + config: + canonical: "maven:sentry-android-core" + - name: registry + type: sdk + config: + canonical: "maven:sentry-android-ndk" + - name: registry + type: sdk + config: + canonical: "maven:sentry-core" +statusProvider: + name: github diff --git a/.travis.yml b/.travis.yml index 96595d33a..db8cead6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ +branches: + only: + - master + - /^release\/.*$/ cache: directories: - $HOME/.gradle/caches/ @@ -32,3 +36,12 @@ matrix: - jdk: openjdk8 after_success: - bash <(curl -s https://codecov.io/bash) +notifications: + webhooks: + urls: + - https://zeus.ci/hooks/d904a9f8-490e-11ea-90b6-2a42b8bf05e4/public/provider/travis/webhook + on_success: always + on_failure: always + on_start: always + on_cancel: always + on_error: always From 1071405cabcc13a1cc4cabd69b518c6a215a0cd7 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 6 Feb 2020 14:41:49 -0500 Subject: [PATCH 2/3] bump version --- buildSrc/src/main/java/Config.kt | 6 ++---- scripts/bump-version.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100755 scripts/bump-version.sh diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 81fdffdb4..cdf6b8c10 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -49,11 +49,9 @@ object Config { object Sentry { val SENTRY_CLIENT_NAME = "sentry.java.android" val group = "io.sentry" -// TODO: change version to publish new version - val version = "2.0.0-rc03" + val version = "2.0.0-rc03" // updated by craft val description = "SDK for sentry.io" -// TODO: change version code to publish new version, follow the pattern of `version` - val buildVersionCode = 20014 + val buildVersionCode = 20014 // updated by craft val website = "https://sentry.io" val userOrg = "getsentry" val repoName = "sentry-android" diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh new file mode 100755 index 000000000..6fd7ebfd1 --- /dev/null +++ b/scripts/bump-version.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -eux + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $SCRIPT_DIR/.. + +OLD_VERSION="$1" +NEW_VERSION="$2" + +# Add the new version +sed -i '' -e "s/val version = \"\(.*\)\" \/\/ updated by craft/val version = \"$NEW_VERSION\" \/\/ updated by craft/g" buildSrc/src/main/java/Config.kt +# Increment the buildVersionCode +perl -pi -e 's{val buildVersionCode = (\d+) // updated by craft}{$n=$1+1; "val buildVersionCode = $n // updated by craft"}e' buildSrc/src/main/java/Config.kt From da978b397d2a729b1f3831aa4fb374cd8a8aaa02 Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Thu, 6 Feb 2020 19:08:50 -0500 Subject: [PATCH 3/3] publish artifacts to zeus --- .travis.yml | 2 ++ scripts/zeus.sh | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100755 scripts/zeus.sh diff --git a/.travis.yml b/.travis.yml index db8cead6f..e20ccf813 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,3 +45,5 @@ notifications: on_start: always on_cancel: always on_error: always +after_success: + - ./scripts/zeus.sh diff --git a/scripts/zeus.sh b/scripts/zeus.sh new file mode 100755 index 000000000..08a26c28b --- /dev/null +++ b/scripts/zeus.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -eux + +yarn global add @zeus-ci/cli + +zeus upload -t "application/zip+aar" ./*/build/outputs/aar/*release.aar +zeus upload -t "application/zip+jar" ./*/build/libs/*release.jar