From cab4f94048e531a82154faeb93e94ab50aedfe29 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Fri, 7 Jun 2024 10:01:28 +0200
Subject: [PATCH 1/2] Try using git rev-parse instead git show-ref

---
 .github/workflows/release_sdk_parallel.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release_sdk_parallel.yml b/.github/workflows/release_sdk_parallel.yml
index 58269a8..c4d68cb 100644
--- a/.github/workflows/release_sdk_parallel.yml
+++ b/.github/workflows/release_sdk_parallel.yml
@@ -95,13 +95,9 @@ jobs:
         id: set_linkable_ref
         run: |
           pushd ${{ env.RUST_SDK_PATH }}
-          if COMMIT_HASH=$(git show-ref --verify refs/heads/${{ github.event.inputs.rust-checkout-ref }} | awk '{print $1}'); then
-            echo linkable_ref=$COMMIT_HASH >> $GITHUB_OUTPUT
-            echo "Using commit hash $COMMIT_HASH"
-          else
-            echo linkable_ref=${{ github.event.inputs.rust-checkout-ref }} >> $GITHUB_OUTPUT
-            echo "Using commit hash ${{ github.event.inputs.rust-checkout-ref }}"
-          fi
+          COMMIT_HASH=$(git rev-parse --verify ${{ github.event.inputs.rust-checkout-ref }})
+          echo linkable_ref=$COMMIT_HASH >> $GITHUB_OUTPUT
+          echo "Using commit hash $COMMIT_HASH"
           popd
 
       - name: Upload target artifacts

From 5855b87c059eff656b65f26c221f58403fc696b4 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 7 Jun 2024 08:42:14 +0000
Subject: [PATCH 2/2] Bump SDK version to 0.2.24 (matrix-rust-sdk to
 3917ba67c925aab5b939ac7211e32f5ece6b9784)

---
 buildSrc/src/main/kotlin/BuildVersionsSDK.kt           |  2 +-
 .../org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildVersionsSDK.kt b/buildSrc/src/main/kotlin/BuildVersionsSDK.kt
index 51ea70c..f410c83 100644
--- a/buildSrc/src/main/kotlin/BuildVersionsSDK.kt
+++ b/buildSrc/src/main/kotlin/BuildVersionsSDK.kt
@@ -1,5 +1,5 @@
 object BuildVersionsSDK {
 	const val majorVersion = 0
 	const val minorVersion = 2
-	const val patchVersion = 23
+	const val patchVersion = 24
 }
diff --git a/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt b/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
index 7173e58..26d8d59 100644
--- a/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
+++ b/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
@@ -29129,7 +29129,7 @@ sealed class TimelineItemContentKind: Disposable  {
     data class Sticker(
         val `body`: kotlin.String, 
         val `info`: ImageInfo, 
-        val `url`: kotlin.String) : TimelineItemContentKind() {
+        val `source`: MediaSource) : TimelineItemContentKind() {
         companion object
     }
     
@@ -29203,7 +29203,7 @@ sealed class TimelineItemContentKind: Disposable  {
     Disposable.destroy(
         this.`body`, 
         this.`info`, 
-        this.`url`)
+        this.`source`)
                 
             }
             is TimelineItemContentKind.Poll -> {
@@ -29281,7 +29281,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer<T
             3 -> TimelineItemContentKind.Sticker(
                 FfiConverterString.read(buf),
                 FfiConverterTypeImageInfo.read(buf),
-                FfiConverterString.read(buf),
+                FfiConverterTypeMediaSource.read(buf),
                 )
             4 -> TimelineItemContentKind.Poll(
                 FfiConverterString.read(buf),
@@ -29344,7 +29344,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer<T
                 4UL
                 + FfiConverterString.allocationSize(value.`body`)
                 + FfiConverterTypeImageInfo.allocationSize(value.`info`)
-                + FfiConverterString.allocationSize(value.`url`)
+                + FfiConverterTypeMediaSource.allocationSize(value.`source`)
             )
         }
         is TimelineItemContentKind.Poll -> {
@@ -29439,7 +29439,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer<T
                 buf.putInt(3)
                 FfiConverterString.write(value.`body`, buf)
                 FfiConverterTypeImageInfo.write(value.`info`, buf)
-                FfiConverterString.write(value.`url`, buf)
+                FfiConverterTypeMediaSource.write(value.`source`, buf)
                 Unit
             }
             is TimelineItemContentKind.Poll -> {