From a5b3321ffca9bbf14df7498742ebd65439e6f458 Mon Sep 17 00:00:00 2001 From: Serge Muhundu Date: Thu, 9 Nov 2023 14:08:35 +0100 Subject: [PATCH 1/7] CI: improve ios pipeline --- apps/mobile/eas.json | 70 +++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json index 89402cdc5..a67702a79 100644 --- a/apps/mobile/eas.json +++ b/apps/mobile/eas.json @@ -1,37 +1,39 @@ { - "build": { - "development": { - "extends": "production", - "developmentClient": true, - "distribution": "internal", - "ios": { - "simulator": true - }, - "channel": "development" - }, - "preview": { - "extends": "production", - "distribution": "internal", - "channel": "preview", + "build": { + "development": { + "extends": "production", + "developmentClient": true, + "distribution": "internal", "ios": { - "simulator": true - } - }, - "production": { - "channel": "production" - } - }, - "submit":{ - "production":{ - "android":{ - "track":"internal", - "releaseStatus":"draft", - "changesNotSentForReview":false - }, - "ios":{ - "ascAppId":"6471266037", - "appleId":"6471266037" - } - } - } + "simulator": true + }, + "channel": "development" + }, + "preview": { + "extends": "production", + "distribution": "internal", + "channel": "preview", + "ios": { + "simulator": true + } + }, + "production": { + "channel": "production" + } + }, + "submit": { + "production": { + "android": { + "track": "internal", + "releaseStatus": "draft", + "changesNotSentForReview": false + }, + "ios": { + "ascAppId": "6471266037", + "ascApiKeyIssuerId": "69a6de8f-4146-47e3-e053-5b8c7c11a4d1", + "ascApiKeyId": "R9QZ5LP8NK", + "ascApiKeyPath": "./AuthKey_R9QZ5LP8NK.p8" + } + } + } } From 57e21e58a5ceb0bf45015d94c8b7434688b79e10 Mon Sep 17 00:00:00 2001 From: Serge Muhundu Date: Thu, 9 Nov 2023 14:09:15 +0100 Subject: [PATCH 2/7] CI: improve ios pipeline --- .github/workflows/mobile.prod.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mobile.prod.yml b/.github/workflows/mobile.prod.yml index bd1dc0109..c4ca42619 100644 --- a/.github/workflows/mobile.prod.yml +++ b/.github/workflows/mobile.prod.yml @@ -85,7 +85,10 @@ jobs: - name: Upload to Play Store Console run: cd apps/mobile && eas submit --platform android --latest --non-interactive - - name: Deploy to App Store - run: cd apps/mobile && eas submit --platform ios --latest --non-interactive + - name: Upload App build to App store env: - EXPO_APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.EXPO_APPLE_APP_SPECIFIC_PASSWORD }} + ascAppId: ${{ secrets.APPLE_ID }} + ascApiKeyIssuerId: ${{ secrets.APPSTORE_ISSUER_ID }} + ascApiKeyId: ${{ secrets.APPSTORE_API_KEY_ID }} + ascApiKey: ${{ secrets.APPSTORE_API_PRIVATE_KEY }} + run: cd apps/mobile && eas submit --platform ios --latest --non-interactive From 5df3dd283ce89e092b4f90fccc416b08f7ffda6d Mon Sep 17 00:00:00 2001 From: Serge Muhundu Date: Thu, 9 Nov 2023 14:21:33 +0100 Subject: [PATCH 3/7] remove secrets data in eas --- apps/mobile/eas.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json index a67702a79..829393376 100644 --- a/apps/mobile/eas.json +++ b/apps/mobile/eas.json @@ -27,12 +27,6 @@ "track": "internal", "releaseStatus": "draft", "changesNotSentForReview": false - }, - "ios": { - "ascAppId": "6471266037", - "ascApiKeyIssuerId": "69a6de8f-4146-47e3-e053-5b8c7c11a4d1", - "ascApiKeyId": "R9QZ5LP8NK", - "ascApiKeyPath": "./AuthKey_R9QZ5LP8NK.p8" } } } From 5f39d9692faea740e066e131f33a8a966b085a5b Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Thu, 9 Nov 2023 14:29:25 +0100 Subject: [PATCH 4/7] chore: actions --- .github/workflows/mobile.before-merge.yml | 11 ++++++++--- .github/workflows/web.before-merge.yml | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mobile.before-merge.yml b/.github/workflows/mobile.before-merge.yml index fa8cebf71..eede245b2 100644 --- a/.github/workflows/mobile.before-merge.yml +++ b/.github/workflows/mobile.before-merge.yml @@ -31,11 +31,16 @@ jobs: - uses: actions/checkout@v3 - - name: Cancel workflow if PR is from develop to main + - name: Skip workflow if PR is from develop to main if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main' run: | - echo "PR is from develop to main. Cancelling the workflow." - exit 78 + echo "PR is from develop to main. Skipping the workflow." + echo "::set-output name=skipped::true" + id: skip_check + + - name: Check if skipped + if: steps.skip_check.outputs.skipped == 'true' + run: echo "Workflow was skipped" && exit 0 - name: Use Node.js 18.x uses: actions/setup-node@v3 diff --git a/.github/workflows/web.before-merge.yml b/.github/workflows/web.before-merge.yml index 6cd13dd1d..a3cb5285f 100644 --- a/.github/workflows/web.before-merge.yml +++ b/.github/workflows/web.before-merge.yml @@ -21,11 +21,16 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Cancel workflow if PR is from develop to main + - name: Skip workflow if PR is from develop to main if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main' run: | - echo "PR is from develop to main. Cancelling the workflow." - exit 78 + echo "PR is from develop to main. Skipping the workflow." + echo "::set-output name=skipped::true" + id: skip_check + + - name: Check if skipped + if: steps.skip_check.outputs.skipped == 'true' + run: echo "Workflow was skipped" && exit 0 - name: Use Node.js 18.x uses: actions/setup-node@v3 From f8e2d6924f8448530873964a2284ef911788e108 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Thu, 9 Nov 2023 14:30:06 +0100 Subject: [PATCH 5/7] chore: spell --- .cspell.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cspell.json b/.cspell.json index f272532ce..31f1ed0ea 100644 --- a/.cspell.json +++ b/.cspell.json @@ -36,7 +36,8 @@ "Huhn", "appdev", "Chatwoot", - "gtag" + "gtag", + "APPSTORE" ], "useGitignore": true, "ignorePaths": [ From 0b2d3ce20e6d8afda7cdd459a07f5acf97af82c3 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Thu, 9 Nov 2023 14:32:00 +0100 Subject: [PATCH 6/7] chore: action names --- .github/workflows/extensions.dev.yml | 2 +- .github/workflows/extensions.prod.yml | 2 +- .github/workflows/mobile.prod.yml | 2 +- .github/workflows/release.dev.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/extensions.dev.yml b/.github/workflows/extensions.dev.yml index 3de909423..16394b73d 100644 --- a/.github/workflows/extensions.dev.yml +++ b/.github/workflows/extensions.dev.yml @@ -1,4 +1,4 @@ -name: 'Extensions Build' +name: 'Extensions Build Dev' on: push: branches: diff --git a/.github/workflows/extensions.prod.yml b/.github/workflows/extensions.prod.yml index 810db2551..eb122c1ed 100644 --- a/.github/workflows/extensions.prod.yml +++ b/.github/workflows/extensions.prod.yml @@ -1,4 +1,4 @@ -name: 'Extensions Build & Publish' +name: 'Extensions Build & Publish Prod' on: push: branches: diff --git a/.github/workflows/mobile.prod.yml b/.github/workflows/mobile.prod.yml index c4ca42619..591e4fbf2 100644 --- a/.github/workflows/mobile.prod.yml +++ b/.github/workflows/mobile.prod.yml @@ -1,4 +1,4 @@ -name: Mobile Build & Deploy PROD +name: Mobile Build, Deploy and Publish PROD on: push: branches: diff --git a/.github/workflows/release.dev.yml b/.github/workflows/release.dev.yml index 0108e347f..49eae0d58 100644 --- a/.github/workflows/release.dev.yml +++ b/.github/workflows/release.dev.yml @@ -1,4 +1,4 @@ -name: Release Prod +name: Release Dev on: push: From d04cd4d3fbad3f367e8682fcad21450c00ac7ed5 Mon Sep 17 00:00:00 2001 From: Serge Muhundu Date: Thu, 9 Nov 2023 14:43:46 +0100 Subject: [PATCH 7/7] update version code and bundle version --- apps/mobile/android/app/build.gradle | 2 +- apps/mobile/ios/GauzyTeams/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle index 06d2c75e5..f8faac6d3 100644 --- a/apps/mobile/android/app/build.gradle +++ b/apps/mobile/android/app/build.gradle @@ -118,7 +118,7 @@ android { applicationId 'ever.team' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 6 + versionCode 7 versionName "0.1.0" } diff --git a/apps/mobile/ios/GauzyTeams/Info.plist b/apps/mobile/ios/GauzyTeams/Info.plist index 8ddd50246..02beeaff8 100644 --- a/apps/mobile/ios/GauzyTeams/Info.plist +++ b/apps/mobile/ios/GauzyTeams/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 4 + 5 LSRequiresIPhoneOS NSAppTransportSecurity