feat(CICD)(ios): upload ipa for testing purposes + feat(webpack): ren…

…ame config files
IGNF · Nov 30, 2023 · 8f23bc9 · 8f23bc9
1 parent f6fd407
commit 8f23bc9
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 83 deletions.
diff --git a/.github/workflows/android-deploy.yml b/.github/workflows/android-deploy.yml
@@ -15,12 +15,8 @@ jobs:
         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
+        run: |
+          echo "GPF_key=${{ secrets.GPF_key }}" > .env
 
       - name: Get the tagname
         id: get_tagname

diff --git a/.github/workflows/ios-deploy.yml b/.github/workflows/ios-deploy.yml
@@ -85,18 +85,23 @@ jobs:
           echo -n "$EXPORT_PLIST" | base64 --decode --output $EXPORT_PLIST_PATH
           cd ios/App && xcodebuild -exportArchive -archivePath $GITHUB_WORKSPACE/ign.xcarchive -exportOptionsPlist $EXPORT_PLIST_PATH -exportPath $RUNNER_TEMP/export
 
+      - name: Upload application
+        uses: actions/upload-artifact@v3
+        with:
+          name: app
+          path: ${{ runner.temp }}/export/App.ipa
+          retention-days: 3
+
       - name: Decode auth api key file and save it
         env:
           API_KEY_BASE64: ${{ secrets.APPSTORE_API_PRIVATE_KEY }}
         run: |
-          ls ~/private_keys
+          mkdir -p ~/private_keys
           echo -n "$API_KEY_BASE64" | base64 --decode --output ~/private_keys/AuthKey_${{ secrets.APPSTORE_API_KEY_ID }}.p8
-          echo "After saving: "
-          ls ~/private_keys
 
       - name: "Upload file to test flight using CLI"
         run: |
           echo "Starting upload"
-          ls ~/private_keys
-          cd ios/App && xcrun altool — validate-app -f $RUNNER_TEMP/export/App.ipa -t ios — apiKey ${{ secrets.APPSTORE_API_KEY_ID }} — apiIssuer ${{ secrets.APPSTORE_ISSUER_ID }}
-          cd ios/App && xcrun altool — upload-app -f $RUNNER_TEMP/export/App.ipa -t ios — apiKey “${{ secrets.APPSTORE_API_KEY_ID }}” — apiIssuer “${{ secrets.APPSTORE_ISSUER_ID }}”
+          ls ~/.private_keys
+          cd ios/App && xcrun altool --validate-app -f $RUNNER_TEMP/export/App.ipa -t ios --apiKey ${{ secrets.APPSTORE_API_KEY_ID }} --apiIssuer ${{ secrets.APPSTORE_ISSUER_ID }}
+          xcrun altool --upload-app -f $RUNNER_TEMP/export/App.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
@@ -28,12 +28,8 @@ jobs:
         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
+        run: |
+          echo "GPF_key=${{ secrets.GPF_key }}" > .env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3

diff --git a/config.xml b/config.xml
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -346,11 +346,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2.90;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.90;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = fr.ign.geoportail;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -366,11 +366,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2.90;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.90;
 				PRODUCT_BUNDLE_IDENTIFIER = fr.ign.geoportail;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
   "description": "Application Géoportail",
   "main": "index.js",
   "scripts": {
-    "build": "webpack --config webpack.config.js",
-    "build:dev": "webpack --config dev.config.js",
-    "serve:dev": "webpack-dev-server --config dev.config.js",
+    "build": "webpack --config webpack.prod.js",
+    "build:dev": "webpack --config webpack.dev.js",
+    "serve:dev": "webpack-dev-server --config webpack.dev.js",
     "run:android": "npm run build:dev && npx cap sync && npx cap run android",
     "build:android": "npm run build && npx cap sync && cd android && ./gradlew assembleRelease",
     "build:android:dev": "npm run build:dev && npx cap sync && cd android && ./gradlew"

diff --git a/dev.config.js → webpack.dev.js b/dev.config.js → webpack.dev.js
diff --git a/webpack.config.js → webpack.prod.js b/webpack.config.js → webpack.prod.js