This commit is contained in:
Stefan Schüller 2020-07-12 19:18:37 +02:00
parent 816400846f
commit 3d6ad98901
2 changed files with 4 additions and 3 deletions

View File

@ -43,7 +43,7 @@ ensureContainer:
before_script: before_script:
# We store this binary file in a variable as hex with this command, `xxd -p thorium-android-app.jks` # 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 # 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 # 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_CODE=$((1047 + $CI_PIPELINE_IID)) && echo $VERSION_CODE"
- "export VERSION_SHA=`echo ${CI_COMMIT_SHA:0:8}` && echo $VERSION_SHA" - "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 # 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" # - mv ./fastlane/metadata/android/en-GB/changelogs/CURRENT_VERSION.txt "./fastlane/metadata/android/en-GB/changelogs/$VERSION_CODE.txt"
after_script: after_script:
- rm -f android-signing-keystore.jks || true - rm -f ../android-signing-keystore.jks || true
artifacts: artifacts:
paths: paths:
- app/build/outputs - app/build/outputs

View File

@ -40,4 +40,5 @@ RUN gem update --system 3.0.8 # https://github.com/rubygems/rubygems/issues/3068
RUN gem install bundler RUN gem install bundler
RUN bundle install RUN bundle install
#RUN echo "org.gradle.jvmargs=-Xmx768m" >> local.properties # at least 1.5G memory is required for the gitlab runner to succeed
#RUN echo "org.gradle.jvmargs=-Xmx1536m" >> local.properties