Loading .gitlab-ci.yml +47 −34 Original line number Diff line number Diff line Loading @@ -18,8 +18,6 @@ before_script: - echo MURENA_CLIENT_ID=$MURENA_CLIENT_ID >> local.properties - echo MURENA_REDIRECT_URI=$MURENA_REDIRECT_URI >> local.properties - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID >> local.properties - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI >> local.properties - echo YAHOO_CLIENT_ID=$YAHOO_CLIENT_ID >> local.properties Loading @@ -31,9 +29,30 @@ cache: paths: - .gradle/ build: build-prod: stage: build script: - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - ./gradlew build -x test - cd app/build/outputs/apk/ose/ - | if [[ ! -d "release" ]]; then echo "$APK_PATH does not exist." exit 1 fi cd "release" unsigned_build=$(ls *.apk | grep "unsigned") cp $unsigned_build $UNSIGNED_APK artifacts: paths: - app/build/outputs/apk/ose/ build-staging: stage: build script: - echo MURENA_BASE_URL=$MURENA_BASE_URL_STAGING >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT_STAGING >> local.properties - ./gradlew build -x test - cd app/build/outputs/apk/ose/ - | Loading @@ -50,28 +69,33 @@ build: init_submodules: stage: gitlab_release rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success script: - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo artifacts: paths: - systemAppsUpdateInfo/scripts/ generate-apks: generate-prod-apks: stage: gitlab_release rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success needs: - init_submodules - build dependencies: - init_submodules - build before_script: - apt update && apt install apksigner -y - job: init_submodules - job: build-prod script: - | ./systemAppsUpdateInfo/scripts/generate-apks.sh \ "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" "$TEST_APK" artifacts: paths: - $APK_PATH/$UNSIGNED_APK - $APK_PATH/$COMMUNITY_APK - $APK_PATH/$OFFICIAL_APK - $APK_PATH/$TEST_APK generate-staging-apks: stage: gitlab_release needs: - job: init_submodules - job: build-staging script: - | ./systemAppsUpdateInfo/scripts/generate-apks.sh \ Loading @@ -85,17 +109,12 @@ generate-apks: create-json-files: stage: gitlab_release dependencies: - init_submodules - generate-apks needs: - init_submodules - generate-apks - job: init_submodules - job: generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success before_script: - apt update && apt install jq aapt -y script: - | ./systemAppsUpdateInfo/scripts/create-json-files.sh \ Loading @@ -108,17 +127,13 @@ create-json-files: create-test-release: stage: gitlab_release dependencies: - init_submodules needs: - init_submodules - create-json-files - generate-apks - job: init_submodules - job: create-json-files - job: generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual before_script: - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-test-release.sh \ Loading @@ -132,12 +147,10 @@ create-release: needs: - init_submodules - create-json-files - generate-apks - generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual before_script: - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-release.sh \ Loading Loading
.gitlab-ci.yml +47 −34 Original line number Diff line number Diff line Loading @@ -18,8 +18,6 @@ before_script: - echo MURENA_CLIENT_ID=$MURENA_CLIENT_ID >> local.properties - echo MURENA_REDIRECT_URI=$MURENA_REDIRECT_URI >> local.properties - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - echo GOOGLE_CLIENT_ID=$GOOGLE_CLIENT_ID >> local.properties - echo GOOGLE_REDIRECT_URI=$GOOGLE_REDIRECT_URI >> local.properties - echo YAHOO_CLIENT_ID=$YAHOO_CLIENT_ID >> local.properties Loading @@ -31,9 +29,30 @@ cache: paths: - .gradle/ build: build-prod: stage: build script: - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT >> local.properties - ./gradlew build -x test - cd app/build/outputs/apk/ose/ - | if [[ ! -d "release" ]]; then echo "$APK_PATH does not exist." exit 1 fi cd "release" unsigned_build=$(ls *.apk | grep "unsigned") cp $unsigned_build $UNSIGNED_APK artifacts: paths: - app/build/outputs/apk/ose/ build-staging: stage: build script: - echo MURENA_BASE_URL=$MURENA_BASE_URL_STAGING >> local.properties - echo MURENA_DISCOVERY_END_POINT=$MURENA_DISCOVERY_END_POINT_STAGING >> local.properties - ./gradlew build -x test - cd app/build/outputs/apk/ose/ - | Loading @@ -50,28 +69,33 @@ build: init_submodules: stage: gitlab_release rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success script: - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo artifacts: paths: - systemAppsUpdateInfo/scripts/ generate-apks: generate-prod-apks: stage: gitlab_release rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success needs: - init_submodules - build dependencies: - init_submodules - build before_script: - apt update && apt install apksigner -y - job: init_submodules - job: build-prod script: - | ./systemAppsUpdateInfo/scripts/generate-apks.sh \ "$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" "$TEST_APK" artifacts: paths: - $APK_PATH/$UNSIGNED_APK - $APK_PATH/$COMMUNITY_APK - $APK_PATH/$OFFICIAL_APK - $APK_PATH/$TEST_APK generate-staging-apks: stage: gitlab_release needs: - job: init_submodules - job: build-staging script: - | ./systemAppsUpdateInfo/scripts/generate-apks.sh \ Loading @@ -85,17 +109,12 @@ generate-apks: create-json-files: stage: gitlab_release dependencies: - init_submodules - generate-apks needs: - init_submodules - generate-apks - job: init_submodules - job: generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: on_success before_script: - apt update && apt install jq aapt -y script: - | ./systemAppsUpdateInfo/scripts/create-json-files.sh \ Loading @@ -108,17 +127,13 @@ create-json-files: create-test-release: stage: gitlab_release dependencies: - init_submodules needs: - init_submodules - create-json-files - generate-apks - job: init_submodules - job: create-json-files - job: generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual before_script: - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-test-release.sh \ Loading @@ -132,12 +147,10 @@ create-release: needs: - init_submodules - create-json-files - generate-apks - generate-prod-apks rules: - if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"' when: manual before_script: - apt update && apt install jq -y script: - | ./systemAppsUpdateInfo/scripts/create-release.sh \ Loading