Merge pull request #58 from matrix-org/fga/fix_git_linkable_ref

Try using git rev-parse instead git show-ref
matrix-org · Jun 7, 2024 · f47651d · f47651d
2 parents b27f51c + 5855b87
commit f47651d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git 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

diff --git 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
@@ -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 -> {