diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 049df29a0..89bd024c6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,7 +21,7 @@ jobs: permissions: contents: read pull-requests: read - uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@161dace284ff29473ea607bf26f436f6bb46c057 + uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@d275481d345e4b3b1252006dbb6cf029c9e32767 secrets: BUILD_CACHE_AWS_REGION: ${{ secrets.BUILD_CACHE_AWS_REGION }} BUILD_CACHE_AWS_BUCKET: ${{ secrets.BUILD_CACHE_AWS_BUCKET }} diff --git a/.github/workflows/pr-clean-stale.yaml b/.github/workflows/pr-clean-stale.yaml index b0e2fccbd..c766c7e19 100644 --- a/.github/workflows/pr-clean-stale.yaml +++ b/.github/workflows/pr-clean-stale.yaml @@ -11,5 +11,5 @@ permissions: jobs: pr-clean-stale: - uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v1.0.0 + uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v1.0.1 secrets: inherit diff --git a/.github/workflows/pr-quality.yml b/.github/workflows/pr-quality.yml index 6a8af5e1b..f056a10b3 100644 --- a/.github/workflows/pr-quality.yml +++ b/.github/workflows/pr-quality.yml @@ -14,5 +14,5 @@ concurrency: jobs: pr-checklist: - uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v1.0.0 + uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v1.0.1 secrets: inherit diff --git a/.github/workflows/publish-new-version.yml b/.github/workflows/publish-new-version.yml index aaa384531..0f6a056c2 100644 --- a/.github/workflows/publish-new-version.yml +++ b/.github/workflows/publish-new-version.yml @@ -48,7 +48,7 @@ jobs: permissions: contents: write needs: pre_release_check - uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@161dace284ff29473ea607bf26f436f6bb46c057 + uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@d275481d345e4b3b1252006dbb6cf029c9e32767 with: bump: ${{ inputs.bump }} suffix: ${{ inputs.suffix }} @@ -82,8 +82,18 @@ jobs: GH_TOKEN: ${{ github.token }} run: | set -euo pipefail - # The release concurrency group means the newest release is this run's. - TAG=$(gh release list -R "$GITHUB_REPOSITORY" --limit 1 --json tagName -q '.[0].tagName') + # The release this run created: the reusable workflow targets it at the + # release-- branch, and it was published after this run started. + # "Newest release" alone could be one made by hand, or one from another branch. + STARTED=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" -q .created_at) + TAG=$(gh api "repos/$GITHUB_REPOSITORY/releases?per_page=30" -q " + [.[] | select((.target_commitish | startswith(\"release-${GITHUB_REF_NAME}-\")) + and .published_at != null and .published_at >= \"$STARTED\")] + | first | .tag_name // empty") + if [ -z "$TAG" ]; then + echo "::error::No release from this run found for ${GITHUB_REF_NAME}" + exit 1 + fi cat > card.md < [!IMPORTANT] diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 033335ba2..fd757aec4 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -12,7 +12,7 @@ jobs: release: permissions: contents: write - uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v1.0.0 + uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v1.0.1 with: bump: patch snapshot: true diff --git a/.github/workflows/sdk-size-checks.yml b/.github/workflows/sdk-size-checks.yml index d92b10af1..681d4aa58 100644 --- a/.github/workflows/sdk-size-checks.yml +++ b/.github/workflows/sdk-size-checks.yml @@ -13,7 +13,7 @@ concurrency: jobs: compare-sdk-sizes: - uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v1.0.0 + uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v1.0.1 with: modules: "stream-feeds-android-client" metrics-project: "stream-feeds-android-metrics" diff --git a/.github/workflows/sdk-size-updates.yml b/.github/workflows/sdk-size-updates.yml index 3d332c699..1e2698628 100644 --- a/.github/workflows/sdk-size-updates.yml +++ b/.github/workflows/sdk-size-updates.yml @@ -15,7 +15,7 @@ jobs: update-sdk-sizes: permissions: contents: read - uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@161dace284ff29473ea607bf26f436f6bb46c057 + uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@d275481d345e4b3b1252006dbb6cf029c9e32767 with: modules: "stream-feeds-android-client" metrics-project: "stream-feeds-android-metrics" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33b26b01f..ece5c9a98 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ streamAndroidCore = "5.1.1" symbolProcessingApi = "2.2.0-2.0.2" lifecycleProcess = "2.9.1" lifecycleViewModelCompose = "2.4.0" -streamConventions = "1.0.0" +streamConventions = "1.0.1" turbine = "1.2.1" [libraries]