Merge remote-tracking branch 'origin2/main'

pixkk · Jan 13, 2025 · 0d46619 · 0d46619
2 parents 82476b0 + d309ecf
commit 0d46619
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/canary_ci.yml b/.github/workflows/canary_ci.yml
@@ -27,6 +27,9 @@ jobs:
       - name: Set App Version
         working-directory: NUXT
         run: sed -i 's/dev-local/${{ inputs.versionNumber }}/' nuxt.config.js
+      - name: Set App Version in build.gradle
+        working-directory: android/app
+        run: sed -i 's/dev-local/${{ inputs.versionNumber }}/' build.gradle
       - name: Build web assets
         working-directory: NUXT
         run: npm run generate
@@ -95,7 +98,7 @@ jobs:
       - name: Set up XCode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest-stable
+          xcode-version: 16.1.0
       - name: Add `GoogleService-Info.plist`
         run: echo "${{ env.GOOGLE_SERVICE_INFO_PLIST }}" > ios/App/App/GoogleService-Info.plist
       - name: Build and archive with xcodebuild

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,9 @@ jobs:
       - name: Set App Version
         working-directory: NUXT
         run: sed -i 's/dev-local/${{ github.sha }}/' nuxt.config.js
+      - name: Set App Version in build.gradle
+        working-directory: android/app
+        run: sed -i 's/dev-local/${{ inputs.versionNumber }}/' build.gradle
       - name: Build web assets
         working-directory: NUXT
         run: npm run generate
@@ -93,7 +96,7 @@ jobs:
       - name: Set up XCode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest-stable
+          xcode-version: 16.1.0
       - name: Add `GoogleService-Info.plist`
         run: echo "${{ env.GOOGLE_SERVICE_INFO_PLIST }}" > ios/App/App/GoogleService-Info.plist
       - name: Build and archive with xcodebuild