From 3ffe2f7d40e147a4737fec5bf4c0f26b27407400 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 18 Sep 2019 10:27:44 +0200 Subject: [PATCH] Fix (again) issue with bad versionCode generated by Buildkite (#553) --- .buildkite/pipeline.yml | 9 +++++++++ CHANGES.md | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8fcb69b6c0..355fa0e6b2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -11,6 +11,9 @@ steps: # gradle build is long queue: "medium" commands: + # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables + - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH" + - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER" - "./gradlew clean lintGplayRelease assembleGplayDebug --stacktrace" artifact_paths: - "vector/build/outputs/apk/gplay/debug/*.apk" @@ -25,6 +28,9 @@ steps: # gradle build is long queue: "medium" commands: + # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables + - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH" + - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER" - "./gradlew clean lintFdroidRelease assembleFdroidDebug --stacktrace" artifact_paths: - "vector/build/outputs/apk/fdroid/debug/*.apk" @@ -39,6 +45,9 @@ steps: # gradle build is long queue: "medium" commands: + # Workaround to set env variables from Buildkite. If we do not do that, the gradle script does not see the Buildkite env variables + - "export BUILDKITE_BRANCH=$BUILDKITE_BRANCH" + - "export BUILDKITE_BUILD_NUMBER=$BUILDKITE_BUILD_NUMBER" - "./gradlew clean assembleGplayRelease --stacktrace" artifact_paths: - "vector/build/outputs/apk/gplay/release/*.apk" diff --git a/CHANGES.md b/CHANGES.md index de38ef4cef..cd6db863c5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,7 +17,7 @@ Translations: - Build: - - + - Fix (again) issue with bad versionCode generated by Buildkite (#553) Changes in RiotX 0.5.0 (2019-09-17) ===================================================