wip: testing version for beta

wireapp · Dec 19, 2024 · 53e2a3f · 53e2a3f
1 parent 8792a6c
commit 53e2a3f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build-beta-app.yml b/.github/workflows/build-beta-app.yml
@@ -6,7 +6,7 @@ on:
       - main
   pull_request:
     branches:
-      - main
+      - fix/mls-migration-sync
   workflow_call:
 
 concurrency:
@@ -79,21 +79,21 @@ jobs:
           KEYPWD_RELEASE: ${{ secrets.SIGNING_KEY_PASSWORD_PRE_RELEASE }}
           KEYSTOREPWD_RELEASE: ${{ secrets.SIGNING_STORE_PASSWORD_PRE_RELEASE }}
           ENABLE_SIGNING: ${{ secrets.ENABLE_SIGNING }}
-      - name: Upload
-        if: success()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Build Artifacts
-          path: app/build/outputs/
-      - name: Create service_account.json
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-      - name: Deploy to internal track
-        uses: r0adkll/upload-google-play@v1
-        with:
-          serviceAccountJson: service_account.json
-          packageName: com.wire.android.internal
-          releaseFiles: app/build/outputs/bundle/betaRelease/*.aab
-          track: internal
+#      - name: Upload // TODO uncomment before merge
+#        if: success()
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: Build Artifacts
+#          path: app/build/outputs/
+#      - name: Create service_account.json
+#        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+#      - name: Deploy to internal track
+#        uses: r0adkll/upload-google-play@v1
+#        with:
+#          serviceAccountJson: service_account.json
+#          packageName: com.wire.android.internal
+#          releaseFiles: app/build/outputs/bundle/betaRelease/*.aab
+#          track: internal
       - name: Deploy BetaRelease to S3
         uses: ./.github/actions/deploy-to-s3
         with:

diff --git a/kalium b/kalium
+4 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt
+28 −29		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
+1 −1		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationEntity.kt