Loading .gitlab-ci.yml +8 −9 Original line number Original line Diff line number Diff line Loading @@ -61,13 +61,13 @@ ktlintDebug: buildRelease: buildRelease: stage: release stage: release allow_failure: false allow_failure: false #rules: rules: # - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' # when: always when: always #- if: '$CI_COMMIT_REF_PROTECTED == "true"' - if: '$CI_COMMIT_REF_PROTECTED == "true"' # when: always when: always #- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # when: always when: always script: script: - ./gradlew assembleRelease - ./gradlew assembleRelease artifacts: artifacts: Loading Loading @@ -146,11 +146,10 @@ pushToPrebuilt: - NEW_APK_VERSION=$(awk -F '-' '{print $2}' <<< "$NEW_APK_NAME") - NEW_APK_VERSION=$(awk -F '-' '{print $2}' <<< "$NEW_APK_NAME") - echo $NEW_APK_NAME - echo $NEW_APK_NAME - echo $NEW_APK_VERSION - echo $NEW_APK_VERSION - git lfs clone -b 55-test-auto-publish git@gitlab.e.foundation:e/os/android_prebuilts_prebuiltapks_lfs.git - git lfs clone git@gitlab.e.foundation:e/os/android_prebuilts_prebuiltapks_lfs.git - cd android_prebuilts_prebuiltapks_lfs - cd android_prebuilts_prebuiltapks_lfs - rm Apps/*-release.apk - rm Apps/*-release.apk - mv ../${NEW_APK_PATH}/${NEW_APK_NAME} Apps/ - mv ../${NEW_APK_PATH}/${NEW_APK_NAME} Apps/ - ls -l Apps # Debug only - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk # todo: improve to replace based on REGEX¨P and not line number - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk # todo: improve to replace based on REGEX¨P and not line number - git config user.email "gitlab@e.foundation" - git config user.email "gitlab@e.foundation" - git config user.name "gitlab" - git config user.name "gitlab" Loading Loading
.gitlab-ci.yml +8 −9 Original line number Original line Diff line number Diff line Loading @@ -61,13 +61,13 @@ ktlintDebug: buildRelease: buildRelease: stage: release stage: release allow_failure: false allow_failure: false #rules: rules: # - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' # when: always when: always #- if: '$CI_COMMIT_REF_PROTECTED == "true"' - if: '$CI_COMMIT_REF_PROTECTED == "true"' # when: always when: always #- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # when: always when: always script: script: - ./gradlew assembleRelease - ./gradlew assembleRelease artifacts: artifacts: Loading Loading @@ -146,11 +146,10 @@ pushToPrebuilt: - NEW_APK_VERSION=$(awk -F '-' '{print $2}' <<< "$NEW_APK_NAME") - NEW_APK_VERSION=$(awk -F '-' '{print $2}' <<< "$NEW_APK_NAME") - echo $NEW_APK_NAME - echo $NEW_APK_NAME - echo $NEW_APK_VERSION - echo $NEW_APK_VERSION - git lfs clone -b 55-test-auto-publish git@gitlab.e.foundation:e/os/android_prebuilts_prebuiltapks_lfs.git - git lfs clone git@gitlab.e.foundation:e/os/android_prebuilts_prebuiltapks_lfs.git - cd android_prebuilts_prebuiltapks_lfs - cd android_prebuilts_prebuiltapks_lfs - rm Apps/*-release.apk - rm Apps/*-release.apk - mv ../${NEW_APK_PATH}/${NEW_APK_NAME} Apps/ - mv ../${NEW_APK_PATH}/${NEW_APK_NAME} Apps/ - ls -l Apps # Debug only - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk # todo: improve to replace based on REGEX¨P and not line number - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk # todo: improve to replace based on REGEX¨P and not line number - git config user.email "gitlab@e.foundation" - git config user.email "gitlab@e.foundation" - git config user.name "gitlab" - git config user.name "gitlab" Loading