fix sync in github ci, update to 3.9.1

TheCacophonyProject · Nov 24, 2024 · f5dc62f · f5dc62f
1 parent 7628729
commit f5dc62f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,31 +17,26 @@ jobs:
       LC_ALL: en_US.UTF-8
 
     steps:
-      # 1. Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
 
-      # 2. Set up JDK 17
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: "temurin"
           java-version: "17"
 
-      # 3. Set up Node.js
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: "20"
 
-      # 4. Setup pnpm
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 9
           run_install: false
 
-      # 5. Cache pnpm store
       - name: Cache pnpm store
         uses: actions/cache@v3
         with:
@@ -50,23 +45,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      # 6. Configure pnpm store
       - name: Configure pnpm store
         run: pnpm config set store-dir ~/.pnpm-store
 
-      # 7. Install Dependencies
       - name: Install Dependencies
         run: pnpm install
 
-      # 8. Build Project
       - name: Build Project
         run: pnpm build
 
-      # 9. Set up Android SDK
       - name: Set up Android SDK
         uses: android-actions/setup-android@v3
 
-      # 10. Decrypt and Extract signing.tar.enc
+      - name: Build Project
+        run: pnpm sync
+
       - name: Decrypt and Extract signing.tar.enc
         env:
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@@ -77,20 +70,17 @@ jobs:
           tar xvf signing.tar
         working-directory: sidekick
 
-      # 11. Verify Decryption
       - name: Verify Decryption
         run: ls -la
         working-directory: sidekick
 
-      # 12. Configure Keystore
       - name: Configure Keystore
         run: |
           mkdir -p ~/.android
           cp keystore.properties ~/.android/keystore.properties
           cp android-keystore.jks ~/.android/android-keystore.jks
         working-directory: sidekick
 
-      # 13. Cache Gradle packages
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:
@@ -102,19 +92,16 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      # 14. Make gradlew Executable
       - name: Make gradlew Executable
         run: chmod +x ./gradlew
         working-directory: sidekick
 
-      # 15. Set up Ruby
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.0" # Specify the Ruby version you need
           bundler-cache: true # Automatically caches gems
 
-      # 16. Build and Deploy with Fastlane
       - name: Build and Deploy with Fastlane
         working-directory: sidekick # Directory containing Fastfile
         run: bundle exec fastlane alpha
diff --git a/sidekick/App/App/public/index.html b/sidekick/App/App/public/index.html
@@ -7,7 +7,7 @@
     <link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=no"/>
     <title>Sidekick</title>
-    <script type="module" crossorigin src="/assets/index-297c7efd.js"></script>
+    <script type="module" crossorigin src="/assets/index-7ca942a4.js"></script>
     <link rel="stylesheet" href="/assets/index-019629f6.css">
   </head>
   <body>

diff --git a/sidekick/App/Podfile b/sidekick/App/Podfile
@@ -22,7 +22,7 @@ def capacitor_pods
   pod 'CapacitorGeolocation', :path => '../../node_modules/.pnpm/@capacitor+geolocation@6.0.1_@capacitor+core@6.1.2/node_modules/@capacitor/geolocation'
   pod 'CapacitorNetwork', :path => '../../node_modules/.pnpm/@capacitor+network@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/network'
   pod 'CapacitorPreferences', :path => '../../node_modules/.pnpm/@capacitor+preferences@6.0.2_@capacitor+core@6.1.2/node_modules/@capacitor/preferences'
-  pod 'SentryCapacitor', :path => '../../node_modules/.pnpm/@sentry+capacitor@1.0.1_@capacitor+core@6.1.2/node_modules/@sentry/capacitor'
+  pod 'SentryCapacitor', :path => '../../node_modules/.pnpm/@sentry+capacitor@1.0.2_@capacitor+core@6.1.2/node_modules/@sentry/capacitor'
   pod 'CapacitorNativeSettings', :path => '../../node_modules/.pnpm/capacitor-native-settings@6.0.1_@capacitor+core@6.1.2/node_modules/capacitor-native-settings'
 end
 

diff --git a/sidekick/app/build.gradle.kts b/sidekick/app/build.gradle.kts
@@ -16,7 +16,7 @@ val sdk = 34
 val minSdkVersion = 22
 val majorVersion = 3
 val minorVersion = 9
-val patchVersion = 0
+val patchVersion = 1
 android {
     buildToolsVersion = "34.0.0"
     namespace = "nz.org.cacophony.sidekick"

diff --git a/sidekick/app/src/main/assets/capacitor.config.json b/sidekick/app/src/main/assets/capacitor.config.json
@@ -6,8 +6,7 @@
 	"backgroundColor": "#f9fafb",
 	"server": {
 		"hostname": "cacophony.org.nz",
-		"androidScheme": "http",
-		"url": "http://localhost:5173"
+		"androidScheme": "http"
 	},
 	"android": {
 		"path": "sidekick"