Build and push in buildAndPushFdroid job

.gitlab-ci.yml

-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"