From f5dc62f0e0540c65957d723a633d96e4d32d038b Mon Sep 17 00:00:00 2001 From: Patrick Baxter Date: Mon, 25 Nov 2024 11:16:32 +1300 Subject: [PATCH] fix sync in github ci, update to 3.9.1 --- .github/workflows/ci.yml | 19 +++---------------- sidekick/App/App/public/index.html | 2 +- sidekick/App/Podfile | 2 +- sidekick/app/build.gradle.kts | 2 +- .../app/src/main/assets/capacitor.config.json | 3 +-- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9acfd11b..8d242dac 100644 --- 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,12 +70,10 @@ 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 @@ -90,7 +81,6 @@ jobs: 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 index 1c15ecd4..974ab10c 100644 --- a/sidekick/App/App/public/index.html +++ b/sidekick/App/App/public/index.html @@ -7,7 +7,7 @@ Sidekick - + diff --git a/sidekick/App/Podfile b/sidekick/App/Podfile index 0d4a2da7..cf7aa86b 100755 --- 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 index c771bc1f..1c19495e 100755 --- 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 index f45c72b4..559dd8f8 100755 --- 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"