From f6ae238ac33ea142a58547a91b4314dd2e48d575 Mon Sep 17 00:00:00 2001
From: "amaury.zarzelli" <amaury.zarzelli@ign.fr>
Date: Tue, 28 Nov 2023 17:29:03 +0100
Subject: [PATCH] fix(CICD): fix CICD workflows

---
 .github/workflows/android-deploy.yml |  8 +++++++-
 .github/workflows/ios-deploy.yml     | 22 ++++++++++++----------
 .github/workflows/web-deploy.yml     |  8 ++++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/android-deploy.yml b/.github/workflows/android-deploy.yml
index bd9568e1..e102e6e1 100644
--- a/.github/workflows/android-deploy.yml
+++ b/.github/workflows/android-deploy.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           directory: .
           file_name: .env
-          envkey_GP_TOKEN: ${{ secrets.GP_TOKEN }}
+          envkey_GPF_key: ${{ secrets.GPF_key }}
           fail_on_empty: false
 
       - name: Get the tagname
@@ -34,6 +34,12 @@ jobs:
       - name: Install app dependencies
         run: npm install
 
+      - name: Build
+        run: npm run build
+
+      - name: Sync
+        run: npx cap sync
+
       - name: Build Android Release APK
         run: cd android && ./gradlew assembleRelease
 
diff --git a/.github/workflows/ios-deploy.yml b/.github/workflows/ios-deploy.yml
index e3a124e2..46628cf0 100644
--- a/.github/workflows/ios-deploy.yml
+++ b/.github/workflows/ios-deploy.yml
@@ -15,12 +15,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Make envfile
-        uses: SpicyPizza/create-envfile@v1.3
-        with:
-          directory: .
-          file_name: .env
-          envkey_GP_TOKEN: ${{ secrets.GP_TOKEN }}
-          fail_on_empty: false
+        run: |
+          echo "GPF_key=${{ secrets.GPF_key }}" > .env
 
       - name: Get the tagname
         id: get_tagname
@@ -34,6 +30,12 @@ jobs:
       - name: Install app dependencies
         run: npm install
 
+      - name: Build
+        run: npm run build
+
+      - name: Sync
+        run: npx cap sync
+
       - name: Install the Apple certificate and provisioning profile
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -63,14 +65,14 @@ jobs:
           mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
       - name: Build app
-        run: xcodebuild -scheme "IGNProduction" clean archive -archivePath "ign" -configuration "Release Production"
+        run: cd ios && xcodebuild -scheme "IGNProduction" clean archive -archivePath "ign" -configuration "Release Production"
       - name: export ipa
         env:
           EXPORT_PLIST: ${{ secrets.IOS_EXPORT_PRODUCTION }}
         run: |
           EXPORT_PLINST_PATH=$RUNNER_TEMP/ExportOptions.plist
           echo -n "$EXPORT_PLIST" | base64 --decode --output $EXPORT_PLIST_PATH
-          xcodebuild -exportArchive -archivePath $GITHUB_WORKSPACE/ign.xcarchive -exportOptionsPlist $EXPORT_PLIST_PATH -exportPath $RUNNER_TEMP/export
+          cd ios && xcodebuild -exportArchive -archivePath $GITHUB_WORKSPACE/ign.xcarchive -exportOptionsPlist $EXPORT_PLIST_PATH -exportPath $RUNNER_TEMP/export
 
       - name: Decode auth api key file and save it
         env:
@@ -85,5 +87,5 @@ jobs:
         run: |
           echo "Starting upload"
           ls ~/private_keys
-          xcrun altool — validate-app -f $RUNNER_TEMP/export/IGNProduction.ipa -t ios — apiKey ${{ secrets.APPSTORE_API_KEY_ID }} — apiIssuer ${{ secrets.APPSTORE_ISSUER_ID }}
-          xcrun altool — upload-app -f $RUNNER_TEMP/export/IGNProduction.ipa -t ios — apiKey “${{ secrets.APPSTORE_API_KEY_ID }}” — apiIssuer “${{ secrets.APPSTORE_ISSUER_ID }}”
+          cd ios && xcrun altool — validate-app -f $RUNNER_TEMP/export/IGNProduction.ipa -t ios — apiKey ${{ secrets.APPSTORE_API_KEY_ID }} — apiIssuer ${{ secrets.APPSTORE_ISSUER_ID }}
+          cd ios && xcrun altool — upload-app -f $RUNNER_TEMP/export/IGNProduction.ipa -t ios — apiKey “${{ secrets.APPSTORE_API_KEY_ID }}” — apiIssuer “${{ secrets.APPSTORE_ISSUER_ID }}”
diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml
index 287540ae..67dba7a9 100644
--- a/.github/workflows/web-deploy.yml
+++ b/.github/workflows/web-deploy.yml
@@ -27,6 +27,14 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v3
 
+      - name: Make envfile
+        uses: SpicyPizza/create-envfile@v1.3
+        with:
+          directory: .
+          file_name: .env
+          envkey_GPF_key: ${{ secrets.GPF_key }}
+          fail_on_empty: false
+
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with: