fix: Merged main to MoveSelectionToAnotherPage branch and fixed confl…

…ict in editor.dart
saber-notes · Jun 19, 2024 · ce101ee · ce101ee
1 parent 2189be0
commit ce101ee
Show file tree

Hide file tree

Showing 361 changed files with 6,565 additions and 3,652 deletions.
diff --git a/.github/workflows/android-play-store.yml b/.github/workflows/android-play-store.yml
@@ -6,12 +6,16 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/android-play-store.yml
 
 jobs:
   build-aab:
     name: Build AAB for the Play Store
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -6,37 +6,18 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/android.yml
 
 jobs:
-  get-version:
-    name: Get version
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    outputs:
-      buildName: ${{ steps.get_version.outputs.buildName }}
-      buildNumber: ${{ steps.get_version.outputs.buildNumber }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Get version
-        id: get_version
-        run: |
-          # get buildName from lib/data/version.dart
-          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
-          echo "buildName=$buildName" >> $GITHUB_OUTPUT
-
-          # get buildNumber from lib/data/version.dart
-          buildNumber=$(grep -oP '(?<=buildNumber = ).*(?=;)' lib/data/version.dart)
-          echo "buildNumber=$buildNumber" >> $GITHUB_OUTPUT
-
   build-apk:
     name: Build APK
     runs-on: ubuntu-latest
-    needs: get-version
     permissions:
       contents: write
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -106,7 +87,8 @@ jobs:
       - name: Rename signed apk
         id: rename_apk
         run: |
-          apkName="Saber_v${{ needs.get-version.outputs.buildName }}.apk"
+          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
+          apkName="Saber_v${buildName}.apk"
           mv ${{ steps.sign_app.outputs.signedFile }} output/$apkName
           echo "apkName=$apkName" >> $GITHUB_OUTPUT
 
@@ -126,10 +108,9 @@ jobs:
   build-foss-apk:
     name: Build FOSS APK
     runs-on: ubuntu-latest
-    needs: get-version
     permissions:
       contents: write
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -203,7 +184,8 @@ jobs:
       - name: Rename signed apk
         id: rename_apk
         run: |
-          apkName="Saber_FOSS_v${{ needs.get-version.outputs.buildName }}.apk"
+          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
+          apkName="Saber_FOSS_v${buildName}.apk"
           mv ${{ steps.sign_app.outputs.signedFile }} output/$apkName
           echo "apkName=$apkName" >> $GITHUB_OUTPUT
 
@@ -219,101 +201,3 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: output/${{ steps.rename_apk.outputs.apkName }}
-
-  build-foss-alt-apk:
-    name: Build FOSS APK with alternate package name
-    runs-on: ubuntu-latest
-    needs: get-version
-    timeout-minutes: 20
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Remove unneeded files
-        run: |
-          rm -rf appimage
-          rm -rf assets_raw
-          rm -rf flatpak
-          rm -rf installers
-          rm -rf integration_test
-          rm -rf ios
-          rm -rf linux
-          rm -rf macos
-          rm -rf metadata
-          rm -rf packages/onyxsdk_pen
-          rm -rf snap
-          rm -rf submodules
-          rm -rf test
-          rm -rf windows
-
-      - name: Setup cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            build
-          key: ${{ runner.OS }}-saberfoss-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
-          restore-keys: |
-            ${{ runner.OS }}-saberfoss-
-
-      - name: Remove proprietary dependencies
-        run: ./patches/remove_proprietary_dependencies.sh
-
-      - name: Patch package name
-        run: ./patches/alt_package_name.sh
-
-      - name: Setup Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          cache: true
-          cache-key: 'flutter-:os:-:channel:-:version:-:arch:'
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'microsoft'
-          java-version: '17'
-
-      - run: flutter pub get
-
-      - name: Build apk
-        run: |
-          flutter build apk \
-            --dart-define=DIRTY=$DIRTY
-        env:
-          DIRTY: ${{ !startsWith(github.ref, 'refs/tags/') }}
-
-      - name: Move unsigned apk
-        run: |
-          mkdir -p output
-          mv build/app/outputs/flutter-apk/app-release.apk output/
-
-      - name: Sign apk
-        uses: ilharp/sign-android-release@v1
-        id: sign_app
-        with:
-          releaseDir: output
-          signingKey: ${{ secrets.SIGNING_KEY }}
-          keyAlias: ${{ secrets.ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-
-      - name: Rename signed apk
-        id: rename_apk
-        run: |
-          apkName="Saber_FOSS_alt_v${{ needs.get-version.outputs.buildName }}.apk"
-          mv ${{ steps.sign_app.outputs.signedFile }} output/$apkName
-          echo "apkName=$apkName" >> $GITHUB_OUTPUT
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Saber-Android-FOSS-Alt
-          path: output/${{ steps.rename_apk.outputs.apkName }}
-
-      - name: Upload to GitHub release
-        uses: svenstaro/upload-release-action@v2
-        if: false
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: output/${{ steps.rename_apk.outputs.apkName }}
diff --git a/.github/workflows/check-flutter-submodule.yml b/.github/workflows/check-flutter-submodule.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - .github/workflows/check-flutter-submodule.yml
+      - submodules/flutter
   schedule:
     # every 2 days at 5:58 am (random time to avoid spikes in GitHub Actions usage)
     - cron: '58 5 */2 * *'

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -9,35 +9,16 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/ios.yml
 
 jobs:
-  get-version:
-    name: Get version
-    runs-on: ubuntu-latest
-    outputs:
-      buildName: ${{ steps.get_version.outputs.buildName }}
-      buildNumber: ${{ steps.get_version.outputs.buildNumber }}
-    timeout-minutes: 1
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Get version
-        id: get_version
-        run: |
-          # get buildName from lib/data/version.dart
-          buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
-          echo "buildName=$buildName" >> $GITHUB_OUTPUT
-
-          # get buildNumber from lib/data/version.dart
-          buildNumber=$(grep -oP '(?<=buildNumber = ).*(?=;)' lib/data/version.dart)
-          echo "buildNumber=$buildNumber" >> $GITHUB_OUTPUT
-
   build-ios:
     name: Build for iOS
     runs-on: macos-latest
-    needs: get-version
-    timeout-minutes: 30
+    timeout-minutes: 60
     env:
       APP_STORE_CONNECT_ISSUER_ID: ${{secrets.APP_STORE_CONNECT_ISSUER_ID}}
       APP_STORE_CONNECT_KEY_IDENTIFIER: ${{secrets.APP_STORE_CONNECT_KEY_IDENTIFIER}}
@@ -81,7 +62,9 @@ jobs:
           architecture: x64
 
       - name: Install Codemagic CLI Tools
-        run: pip3 install codemagic-cli-tools
+        run: |
+          brew install pipx
+          pipx install codemagic-cli-tools
 
       - name: Setup keychain
         run: |
@@ -101,7 +84,6 @@ jobs:
       - run: find . -name "Podfile" -execdir pod install \;
 
       - name: Build for iOS
-        id: build
         run: |
           flutter build ipa \
             --dart-define=FLAVOR="App Store" \
@@ -110,7 +92,12 @@ jobs:
             --dart-define=DIRTY="false" \
             --export-options-plist=$HOME/export_options.plist
 
-          export ipaPath="Saber_v${{ needs.get-version.outputs.buildName }}.ipa"
+      - name: Move IPA
+        id: move
+        run: |
+          brew install grep
+          buildName=$(ggrep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
+          export ipaPath="Saber_v${buildName}.ipa"
           mv $(find $(pwd) -name "*.ipa") $ipaPath
           echo "ipaPath=$ipaPath" >> $GITHUB_OUTPUT
 
@@ -122,8 +109,8 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Saber-iOS-Archive
-          path: ${{ steps.build.outputs.ipaPath }}
+          path: ${{ steps.move.outputs.ipaPath }}
 
       - name: Publish to App Store
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        run: app-store-connect publish --path ${{ steps.build.outputs.ipaPath }}
+        run: app-store-connect publish --path ${{ steps.move.outputs.ipaPath }}