From 3d6ad9890185ac9eb0be5cbee8c5c89470af2980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= Date: Sun, 12 Jul 2020 19:18:37 +0200 Subject: [PATCH] fastlane --- .gitlab-ci.yml | 4 ++-- Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7d3649..c1f4aad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ ensureContainer: before_script: # We store this binary file in a variable as hex with this command, `xxd -p thorium-android-app.jks` # Then we convert the hex back to a binary file - - echo "$signing_jks_file_hex" | xxd -r -p - > android-signing-keystore.jks + - echo "$signing_jks_file_hex" | xxd -r -p - > ../android-signing-keystore.jks # We add 1047 to get this high enough above current versionCodes that are published - "export VERSION_CODE=$((1047 + $CI_PIPELINE_IID)) && echo $VERSION_CODE" - "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA" @@ -51,7 +51,7 @@ ensureContainer: # This happens for every build, but only on master and tags this change gets submitted as an MR by `buildCreateReleaseNotes` task # - mv ./fastlane/metadata/android/en-GB/changelogs/CURRENT_VERSION.txt "./fastlane/metadata/android/en-GB/changelogs/$VERSION_CODE.txt" after_script: - - rm -f android-signing-keystore.jks || true + - rm -f ../android-signing-keystore.jks || true artifacts: paths: - app/build/outputs diff --git a/Dockerfile b/Dockerfile index 9fa46a5..ce2af3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,4 +40,5 @@ RUN gem update --system 3.0.8 # https://github.com/rubygems/rubygems/issues/3068 RUN gem install bundler RUN bundle install -#RUN echo "org.gradle.jvmargs=-Xmx768m" >> local.properties \ No newline at end of file +# at least 1.5G memory is required for the gitlab runner to succeed +#RUN echo "org.gradle.jvmargs=-Xmx1536m" >> local.properties \ No newline at end of file