Merge branch 'main' into pane-gestures

standardnotes · May 2, 2023 · de70280 · de70280
2 parents 0d77092 + 3df23cd
commit de70280
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 4 deletions.
diff --git a/.github/workflows/ios.testflight.yml b/.github/workflows/ios.testflight.yml
@@ -0,0 +1,57 @@
+name: iOS Testflight
+
+on: workflow_dispatch
+
+jobs:
+  ios:
+    defaults:
+      run:
+        working-directory: packages/mobile
+    runs-on: macos-latest
+    timeout-minutes: 90
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Export version from package.json
+        run:
+          echo "PACKAGE_VERSION=$(grep '"version"' ../web/package.json | cut -d '"' -f 4 | cut -d "-" -f 1)" >> $GITHUB_ENV
+      - name: Install dependencies
+        run: yarn install --immutable && yarn install:pods
+      - run: yarn build:mobile
+      - name: Set ssh connection to Github
+        uses: webfactory/ssh-agent@v0.4.1
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: Export Apple AppStore Connect API key
+        run: echo "${{ secrets.APPSTORE_CONNECT_KEY }}" > ios/Authkey.p8
+      - name: Ruby Setup for Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          working-directory: 'packages/mobile'
+      - name: Setup fastlane
+        uses: maierj/fastlane-action@v1.4.0
+        env:
+          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        with:
+          lane: 'ios setup'
+          subdirectory: 'packages/mobile'
+      - name: fastlane
+        uses: maierj/fastlane-action@v1.4.0
+        env:
+          APPLE_APP_ID: ${{ secrets.APP_APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
+          APPSTORE_CONNECT_KEY_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ISSUER_ID }}
+          BUILD_NUMBER: ${{ github.run_number }}
+          FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
+          FASTLANE_SESSION: ${{ secrets.FASTLANE_SESSION }}
+          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
+          MATCH_CERTIFICATES_URL: ${{ secrets.MATCH_CERTIFICATES_URL }}
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          PACKAGE_VERSION: ${{ env.PACKAGE_VERSION }}
+        with:
+          lane: 'ios testflight'
+          subdirectory: 'packages/mobile'
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.52.36](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.52.35...@standardnotes/mobile@3.52.36) (2023-05-01)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.52.35](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.52.34...@standardnotes/mobile@3.52.35) (2023-05-01)
 
 **Note:** Version bump only for package @standardnotes/mobile

diff --git a/packages/mobile/fastlane/Fastfile b/packages/mobile/fastlane/Fastfile
@@ -34,7 +34,7 @@ platform :ios do
     build_number
   end
 
-  def deploy_ios(scheme)
+  def deploy_ios(scheme, is_testflight = false)
     sign_ios
     build_number = build_ios(scheme)
     app_store_connect_api_key(
@@ -55,7 +55,7 @@ platform :ios do
       changelog: 'Fixes and improvements.'
     )
 
-    if is_prod
+    if is_prod && !is_testflight
       upload_to_app_store(
         build_number: build_number,
         submit_for_review: true,
@@ -83,6 +83,11 @@ platform :ios do
     deploy_ios 'StandardNotes'
   end
 
+  desc 'Deploy prod app to tesflight'
+  lane :testflight do
+    deploy_ios 'StandardNotes', true
+  end
+
   desc 'Setup iOS for running on CI'
   lane :setup do
     setup_project

diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.52.35",
+  "version": "3.52.36",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.267](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.266...@standardnotes/releases@1.4.267) (2023-05-01)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.266](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.265...@standardnotes/releases@1.4.266) (2023-05-01)
 
 **Note:** Version bump only for package @standardnotes/releases

diff --git a/packages/releases/package.json b/packages/releases/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.266",
+  "version": "1.4.267",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",