Merge pull request #1753 from ever-co/develop

Release
ever-co · Nov 9, 2023 · 4159e50 · 4159e50
2 parents 7c59a00 + e178f9d
commit 4159e50
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 50 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -36,7 +36,8 @@
 		"Huhn",
 		"appdev",
 		"Chatwoot",
-		"gtag"
+		"gtag",
+		"APPSTORE"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

diff --git 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
@@ -1,4 +1,4 @@
-name: 'Extensions Build & Publish'
+name: 'Extensions Build & Publish Prod'
 on:
   push:
     branches:

diff --git 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/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:
@@ -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
diff --git a/.github/workflows/release.dev.yml b/.github/workflows/release.dev.yml
@@ -1,4 +1,4 @@
-name: Release Prod
+name: Release Dev
 
 on:
   push:

diff --git 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

diff --git 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/eas.json b/apps/mobile/eas.json
@@ -1,37 +1,33 @@
 {
-  "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
+			}
+		}
+	}
 }
diff --git a/apps/mobile/ios/GauzyTeams/Info.plist b/apps/mobile/ios/GauzyTeams/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>