From fdcdcdc82ede2c7d04b5cdd77c07e968c9546a9d Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Tue, 17 Oct 2023 16:44:14 +0300
Subject: [PATCH] Build and push in buildAndPushFdroid job
---
.gitlab-ci.yml | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f9d6b920..f57b0b28c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-default:
- image: softartdev/android-fastlane
-
workflow:
name: 'Circles release workflow'
rules:
@@ -13,7 +10,6 @@ cache:
stages:
- build
- - push
# - release
# - deploy
@@ -23,30 +19,25 @@ before_script:
- echo "KEY_PATH=../circuli_key.jks" > signing.properties
- echo "KEY_PASSWORD=${KEY_PASSWORD}" >> signing.properties
- echo "ALIAS_NAME=${ALIAS_NAME}" >> signing.properties
- - apt-get update -qy && apt-get upgrade -qy
- - apt-get install -y git
- - git config user.email "taras@futo.org"
- - git config user.name "ci-bot"
-buildFdroid:
+buildAndPushFdroid:
+ image: softartdev/android-fastlane
stage: build
script:
- echo "Building F-Droid apk"
- ./gradlew clean
- ./gradlew assembleFdroidRelease
-
-pushToMain:
- stage: push
- script:
+ - apt-get update -qy && apt-get upgrade -qy
+ - apt-get install -y git
+ - git config user.email "taras@futo.org"
+ - git config user.name "ci-bot"
+ - echo "Push build to master"
- git remote set-url origin https://gitlab-ci-token:${GITLAB_ACCESS_TOKEN}@gitlab.futo.org/circles/circles-android.git
- git add -f app/build/outputs/apk/fdroid/release/circles-$CI_COMMIT_TAG-fdroid-release.apk
- git mv app/build/outputs/apk/fdroid/release/circles-$CI_COMMIT_TAG-fdroid-release.apk .
- git commit -m "Add F-Droid release apk $CI_COMMIT_TAG"
- git push origin HEAD:main -o ci.skip
-
-pushToFdroidRepo:
- stage: push
- script:
+ - echo "Push build to fdroid repo"
- cd ..
- git clone https://gitlab-ci-token:${FDROID_REPO_GITLAB_ACCESS_TOKEN}@gitlab.futo.org/circles/circles-fdroid-repo.git
- cp circles-android/circles-$CI_COMMIT_TAG-fdroid-release.apk circles-fdroid-repo/fdroid/repo
@@ -54,8 +45,6 @@ pushToFdroidRepo:
- git add -f circles-$CI_COMMIT_TAG-fdroid-release.apk
- git commit -m "Add F-Droid release apk $CI_COMMIT_TAG"
- git push origin HEAD:main
- needs: ["pushToMain"]
-
#createGitlabRelease:
# stage: release
@@ -74,6 +63,7 @@ pushToFdroidRepo:
#
#
#uploadPlayStoreBeta:
+# image: softartdev/android-fastlane
# stage: deploy
# script:
# - echo "Running the uploadPlayStoreBeta job"
--
GitLab