From 8425a43ca44a63142d39bd9e386bb8be9ba3b4d4 Mon Sep 17 00:00:00 2001 From: pratimmallick Date: Fri, 8 Aug 2025 16:46:16 +0530 Subject: [PATCH 1/2] Added changes for publishing room-kit --- .github/workflows/roomkit-publish.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/roomkit-publish.yml b/.github/workflows/roomkit-publish.yml index 7ac09e067..dea9e9186 100644 --- a/.github/workflows/roomkit-publish.yml +++ b/.github/workflows/roomkit-publish.yml @@ -56,26 +56,30 @@ jobs: run: chmod +x gradlew - name: Deploy to Maven Central live.100ms - run: ./gradlew clean publish -PhmsRoomKitGroup="live.100ms" -PHMS_ROOM_KIT_VERSION="${{github.ref_name}}" -PossrhUsername="${{ secrets.ANDROID_SONATYPE_USERNAME}}" -PossrhPassword="${{ secrets.ANDROID_SONATYPE_PASSWORD}}" -Psigning.keyId="D00FAF9F" -Psigning.password="${{ secrets.ROOM_KIT_SECRET_KEY_PASSPHRASE }}" -Psigning.secretKeyRingFile="../secrets/secring.gpg" -PTOKEN_ENDPOINT="\"​\"" + run: ./gradlew :room-kit:publishToMavenLocal -PhmsRoomKitGroup="live.100ms" -PHMS_ROOM_KIT_VERSION="${{github.ref_name}}" -PossrhUsername="${{ secrets.ANDROID_SONATYPE_USERNAME}}" -PossrhPassword="${{ secrets.ANDROID_SONATYPE_PASSWORD}}" -Psigning.keyId="D00FAF9F" -Psigning.password="${{ secrets.ROOM_KIT_SECRET_KEY_PASSPHRASE }}" -Psigning.secretKeyRingFile="../secrets/secring.gpg" -PTOKEN_ENDPOINT="\"​\"" - name: Create deployment bundle run: | VERSION="${{ github.ref_name }}" ARTIFACT_ID="room-kit" GROUP_PATH="live/100ms/$ARTIFACT_ID/$VERSION" - LOCAL_REPO_PATH="$HOME/.m2/repository/live/100ms/$ARTIFACT_ID/$VERSION" mkdir -p bundle/$GROUP_PATH - # Copy files from local Maven repository - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}.aar bundle/$GROUP_PATH/ - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}.aar.asc bundle/$GROUP_PATH/ - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}.pom bundle/$GROUP_PATH/ - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}.pom.asc bundle/$GROUP_PATH/ - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}-sources.jar bundle/$GROUP_PATH/ || true - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}-sources.jar.asc bundle/$GROUP_PATH/ || true - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}-javadoc.jar bundle/$GROUP_PATH/ || true - cp $LOCAL_REPO_PATH/${ARTIFACT_ID}-${VERSION}-javadoc.jar.asc bundle/$GROUP_PATH/ || true + # Now copy from local Maven repository where everything is properly structured + LOCAL_REPO="$HOME/.m2/repository/live/100ms/$ARTIFACT_ID/$VERSION" + + # Copy all artifacts and their signatures + cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}.aar bundle/$GROUP_PATH/ + cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}.aar.asc bundle/$GROUP_PATH/ + cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}.pom bundle/$GROUP_PATH/ + cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}.pom.asc bundle/$GROUP_PATH/ + + # Copy sources and javadoc if they exist + [ -f "$LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-sources.jar" ] && cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-sources.jar bundle/$GROUP_PATH/ + [ -f "$LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-sources.jar.asc" ] && cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-sources.jar.asc bundle/$GROUP_PATH/ + [ -f "$LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-javadoc.jar" ] && cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-javadoc.jar bundle/$GROUP_PATH/ + [ -f "$LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-javadoc.jar.asc" ] && cp $LOCAL_REPO/${ARTIFACT_ID}-${VERSION}-javadoc.jar.asc bundle/$GROUP_PATH/ # Generate checksums for file in bundle/$GROUP_PATH/*; do From b1da792a358b13cf3e6db5fae3730717b98255c9 Mon Sep 17 00:00:00 2001 From: pratimmallick Date: Fri, 8 Aug 2025 18:02:50 +0530 Subject: [PATCH 2/2] Added changes for publishing room-kit --- room-kit/build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/room-kit/build.gradle b/room-kit/build.gradle index 9bb8fbf59..47738be76 100644 --- a/room-kit/build.gradle +++ b/room-kit/build.gradle @@ -145,12 +145,14 @@ afterEvaluate { // Creates a Maven publication called "release". release(MavenPublication) { from components.release + + // Only sign the artefacts if this is a maven central build. + // This would only halt jitpack builds and/or make our signing keys public. + if(rootProject.properties["ossrhUsername"]) { + artifact javadocJar + } + pom { - // Only sign the artefacts if this is a maven central build. - // This would only halt jitpack builds and/or make our signing keys public. - if(rootProject.properties["ossrhUsername"]) { - artifact javadocJar - } name = "100ms.live Android Room Kit" description = "Room Kit that simplifies setting up videoconferencing in your own app. See more at https://www.100ms.live/docs/android/v2/guides/quickstart" url = "100ms.live" @@ -181,7 +183,6 @@ afterEvaluate { } if(rootProject.properties["ossrhUsername"]) { - artifact javadocJar signing { sign publishing.publications }