From 257f03bca79ac4b3690ed360a2f486c93f37f88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 20 Mar 2019 15:38:25 +0100 Subject: [PATCH] upgrade ruby to 2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- .TOOLVERSIONS | 1 + ci/Jenkinsfile.android | 7 +------ ci/android.groovy | 1 - ci/ios.groovy | 1 - docker/android/Dockerfile | 20 ++++++++++++-------- docker/android/Makefile | 5 ++++- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.TOOLVERSIONS b/.TOOLVERSIONS index ce25bc9e2e..48106bc9fd 100644 --- a/.TOOLVERSIONS +++ b/.TOOLVERSIONS @@ -2,6 +2,7 @@ android-ndk;r10e;070be287539e3e7706f8dabfb6bf9879 android-sdk-build-tools;28.0.1; android-sdk-platform;android-27; android-sdk;4333796;aa190cfd7299cd6a1c687355bb2764e4 +bundler;1.17.2;bundler clojure_cli;1.9.0.381; cmake;3.12.2; conan;1.9.0; diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index 05200045ff..b3c4d16c99 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -3,7 +3,7 @@ pipeline { docker { label 'linux' /* WARNING: remember to keep this up-to-date with the value in docker/android/Makefile */ - image 'statusteam/status-build-android:1.1.1-cd1596b3' + image 'statusteam/status-build-android:1.1.2-9ea4e0f4' args ( "-v /home/jenkins/tmp:/var/tmp:rw "+ "-v /home/jenkins/status-im.keystore:/tmp/status-im.keystore:ro" @@ -44,11 +44,6 @@ pipeline { ANDROID_SDK_ROOT = '/usr/lib/android-sdk' ANDROID_NDK = '/usr/lib/android-ndk' ANDROID_NDK_HOME = '/usr/lib/android-ndk' - /* We use EXECUTOR_NUMBER to avoid multiple instances clashing */ - LEIN_HOME = "/var/tmp/lein-${EXECUTOR_NUMBER}" - YARN_CACHE_FOLDER = "/var/tmp/yarn-${EXECUTOR_NUMBER}" - BUNDLE_PATH = "/var/tmp/bundle-${EXECUTOR_NUMBER}" - GRADLE_USER_HOME = "/var/tmp/gradle-${EXECUTOR_NUMBER}" } stages { diff --git a/ci/android.groovy b/ci/android.groovy index 537b7cb88a..47937131f7 100644 --- a/ci/android.groovy +++ b/ci/android.groovy @@ -31,7 +31,6 @@ def bundle(type = 'nightly') { def uploadToPlayStore(type = 'nightly') { withCredentials([ string(credentialsId: "SUPPLY_JSON_KEY_DATA", variable: 'GOOGLE_PLAY_JSON_KEY'), - string(credentialsId: "SLACK_URL", variable: 'SLACK_URL') ]) { sh "bundle exec fastlane android ${type}" } diff --git a/ci/ios.groovy b/ci/ios.groovy index 81ff08a871..989de28cf9 100644 --- a/ci/ios.groovy +++ b/ci/ios.groovy @@ -23,7 +23,6 @@ def bundle(type) { sh 'mkdir -p status-e2e' /* build the actual app */ withCredentials([ - string(credentialsId: 'SLACK_URL', variable: 'SLACK_URL'), string(credentialsId: "slave-pass-${env.NODE_NAME}", variable: 'KEYCHAIN_PASSWORD'), string(credentialsId: 'FASTLANE_PASSWORD', variable: 'FASTLANE_PASSWORD'), string(credentialsId: 'APPLE_ID', variable: 'APPLE_ID'), diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile index be01b9ab47..d68f09581c 100644 --- a/docker/android/Dockerfile +++ b/docker/android/Dockerfile @@ -42,6 +42,7 @@ RUN cd /usr/lib/android-ndk && rm -fr docs tests samples \ ################################################################################ FROM statusteam/status-build-base:${BASE_IMAGE_TAG} +ARG BUNDLER_VERSION ARG ANDROID_NDK_VERSION ARG ANDROID_SDK_VERSION @@ -54,19 +55,22 @@ ENV GRADLE_USER_HOME=/var/tmp/gradle \ ANDROID_NDK=/usr/lib/android-ndk \ ANDROID_NDK_HOME=/usr/lib/android-ndk -RUN add-apt-repository -y ppa:cwchien/gradle \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive \ - apt-get -q -y --no-install-recommends install \ - gradle ruby ruby-dev ruby-bundler \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man \ - && gem install cocoapods bundler fastlane fastlane-plugin-diawi fastlane-plugin-clean_testflight_testers CFPropertyList - # Install Android SDK & NDK COPY --from=sdk_and_ndk /usr/lib/android-sdk /usr/lib/android-sdk COPY --from=sdk_and_ndk /usr/lib/android-ndk /usr/lib/android-ndk RUN chmod o+w /usr/lib/android-sdk /usr/lib/android-ndk +RUN add-apt-repository -y ppa:cwchien/gradle \ + && apt-add-repository -y ppa:brightbox/ruby-ng \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive \ + apt-get -q -y --no-install-recommends install \ + gradle ruby2.5 ruby2.5-dev \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man + +RUN gem install bundler -v ${BUNDLER_VERSION} \ + && gem install json cocoapods CFPropertyList + LABEL source="https://github.com/status-im/status-react/tree/develop/docker/android" \ description="Image for building Android version of Status app." \ maintainer="jakub@status.im" diff --git a/docker/android/Makefile b/docker/android/Makefile index 72c7d1a193..97d7b64b88 100644 --- a/docker/android/Makefile +++ b/docker/android/Makefile @@ -13,22 +13,25 @@ ANDROID_SDK_CHECKSUM = $(call __toolversion, -c android-sdk) ANDROID_SDK_URL = https://dl.google.com/android/repository/sdk-tools-linux-$(ANDROID_SDK_VERSION).zip ANDROID_SDK_ARCHIVE = sdk-tools-linux-$(ANDROID_SDK_VERSION).zip +BUNDLER_VERSION=$(call __toolversion, bundler) SDK_PLATFORM_VERSION=$(call __toolversion, android-sdk-platform) SDK_BUILD_TOOLS_VERSION=$(call __toolversion, android-sdk-build-tools) # WARNING: Remember to change the tag when updating the image BASE_IMAGE_TAG = $(shell cd $(GIT_ROOT)/docker/base && make get-image-tag) DEPS_HASH = $(shell $(GIT_ROOT)/scripts/gen-deps-hash.sh -b $(BASE_IMAGE_TAG) \ + -d bundler \ -d android-ndk \ -d android-sdk \ -d android-sdk-platform \ -d android-sdk-build-tools) -IMAGE_TAG = 1.1.1-$(DEPS_HASH) +IMAGE_TAG = 1.1.2-$(DEPS_HASH) IMAGE_NAME = statusteam/status-build-android:$(IMAGE_TAG) build: $(ANDROID_NDK_ARCHIVE) $(ANDROID_SDK_ARCHIVE) docker build \ --build-arg="BASE_IMAGE_TAG=$(BASE_IMAGE_TAG)" \ + --build-arg="BUNDLER_VERSION=$(BUNDLER_VERSION)" \ --build-arg="ANDROID_NDK_VERSION=$(ANDROID_NDK_VERSION)" \ --build-arg="ANDROID_SDK_VERSION=$(ANDROID_SDK_VERSION)" \ --build-arg="SDK_BUILD_TOOLS_VERSION=$(SDK_BUILD_TOOLS_VERSION)" \