From 26ac464fc11f8ba053ddbbfa17d7865f14084968 Mon Sep 17 00:00:00 2001
From: Marvin M <39344769+M123-dev@users.noreply.github.com>
Date: Sun, 21 Aug 2022 14:07:33 +0200
Subject: [PATCH] ci: Finalize new pipline

---
 .github/workflows/README.md                   | 18 ++++-------
 ...d-release-to-org-openfoodfacts-scanner.yml | 21 ++++++------
 ...s-release-to-org-openfoodfacts-scanner.yml | 32 +++++++++----------
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 66babcdfc22..17b8cf44a46 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,8 +1,4 @@
 📦 Existing
-App Store Release(TestFlight): 
- Process: deliver the IOS version onto TestFlight [.github/release.yml](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/release.yml)
- Event: Push on [release/*]
-
 
 Crowdin Action：
  Process: Dump sources and download translations from Crowdin [.github/crowdin.yml](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/crowdin.yml)
@@ -14,16 +10,14 @@ Labeler:
  Event: Creation PR
 
 
-Google Play Release:
- Process: deliver Android version onto Google Play [.github/release.yml](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/release.yml)
- Event: Push on [release/*]
-
-
 Github Pages Deploy Action:
  Process: Deploy auto-generated APIs document in GitHub Pages https://openfoodfacts.github.io/smooth-app/
  Event: Push onto [develop]
 
 
-Release please:
- Process: Update version.txt and CHANGELOG.md by setting release-type=simple
- Event: Push onto [develop]
+Release:
+ The release process is triggered by release please (by merging a generated "chore(develop): release x.x.x" pull request).
+ This triggers the release to the Play- and App-Store using [Fastlane](https://fastlane.tools/).
+ [Release please](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/release-please.yml)
+ [Android release](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/android-release-to-org-openfoodfacts-scanner.yml)
+ [iOS please](https://github.com/openfoodfacts/smooth-app/blob/develop/.github/ios-release-to-org-openfoodfacts-scanner.yml)
diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
index 7e914a20846..d5d07aab489 100644
--- a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
+++ b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
@@ -88,14 +88,13 @@ jobs:
          SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
          SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
 
- #     - name: Release AAB
- #       uses: maierj/fastlane-action@v2.2.1
- #       with:
- #         lane: closed_beta
- #         subdirectory: packages/smooth_app/android
- #       env:
- #        SIGN_STORE_PATH: ./../fastlane/envfiles/keystore.jks
- #        SIGN_STORE_PASSWORD: ${{ secrets.SIGN_STORE_PASSWORD }}
- #        SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
- #        SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
-
+      - name: Release AAB
+        uses: maierj/fastlane-action@v2.2.1
+        with:
+          lane: closed_beta
+          subdirectory: packages/smooth_app/android
+        env:
+         SIGN_STORE_PATH: ./../fastlane/envfiles/keystore.jks
+         SIGN_STORE_PASSWORD: ${{ secrets.SIGN_STORE_PASSWORD }}
+         SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
+         SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
\ No newline at end of file
diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
index 348153a9667..681104141b6 100644
--- a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
+++ b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -112,20 +112,20 @@ jobs:
       - name: cat Podfile
         run: cd ./packages/smooth_app/ios && cat Podfile
  
-#      - name: Release ipa
-#        run: cd ./packages/smooth_app/ios && bundle exec fastlane beta
-#        env:
-#          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-#          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
-#          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
-#          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
-#          MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
-#          MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
-#          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-#          PILOT_APPLE_ID: ${{ secrets.PILOT_APPLE_ID }}
-#          SPACESHIP_CONNECT_API_ISSUER_ID: ${{ secrets.SPACESHIP_CONNECT_API_ISSUER_ID }}
-#          SPACESHIP_CONNECT_API_KEY_ID: ${{ secrets.SPACESHIP_CONNECT_API_KEY_ID }}
-#          SPACESHIP_CONNECT_API_KEY_FILEPATH: ./fastlane/envfiles/AuthKey_KDAUTTM76R.p8
-#          CI_RELEASE: true
+      - name: Release ipa
+        run: cd ./packages/smooth_app/ios && bundle exec fastlane beta
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+          MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
+          MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          PILOT_APPLE_ID: ${{ secrets.PILOT_APPLE_ID }}
+          SPACESHIP_CONNECT_API_ISSUER_ID: ${{ secrets.SPACESHIP_CONNECT_API_ISSUER_ID }}
+          SPACESHIP_CONNECT_API_KEY_ID: ${{ secrets.SPACESHIP_CONNECT_API_KEY_ID }}
+          SPACESHIP_CONNECT_API_KEY_FILEPATH: ./fastlane/envfiles/AuthKey_KDAUTTM76R.p8
+          CI_RELEASE: true