From 8f23bc9914e3ee8378eccf3c38f84378e41b1fff Mon Sep 17 00:00:00 2001 From: "amaury.zarzelli" Date: Thu, 30 Nov 2023 10:18:32 +0100 Subject: [PATCH] feat(CICD)(ios): upload ipa for testing purposes + feat(webpack): rename config files --- .github/workflows/android-deploy.yml | 8 +--- .github/workflows/ios-deploy.yml | 17 +++++--- .github/workflows/web-deploy.yml | 8 +--- config.xml | 58 --------------------------- ios/App/App.xcodeproj/project.pbxproj | 8 ++-- package.json | 6 +-- dev.config.js => webpack.dev.js | 0 webpack.config.js => webpack.prod.js | 0 8 files changed, 22 insertions(+), 83 deletions(-) delete mode 100644 config.xml rename dev.config.js => webpack.dev.js (100%) rename webpack.config.js => webpack.prod.js (100%) diff --git a/.github/workflows/android-deploy.yml b/.github/workflows/android-deploy.yml index e102e6e1..0a601be9 100644 --- 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 index 1671303f..8c204d6f 100644 --- 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 index 67dba7a9..89f3e480 100644 --- 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 deleted file mode 100644 index 869e2fa4..00000000 --- a/config.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - Géoportail - - L’application Géoportail réunit les 8 cartes et données les plus plébiscitées par les utilisateurs du Géoportail, le portail de l’information géographique de référence sur le territoire national. - - - IGN - Géoportail - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Nécessite l'accès à la géolocalisation pour centrer la carte sur l'utilisateur - - - - - - - - diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 620ebf99..2dff4f11 100644 --- 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 index 896e87ea..b306ec94 100644 --- 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 b/webpack.dev.js similarity index 100% rename from dev.config.js rename to webpack.dev.js diff --git a/webpack.config.js b/webpack.prod.js similarity index 100% rename from webpack.config.js rename to webpack.prod.js