Repository navigation
chore: merge upstream compscidr/main (SDK 37.2, empty-codename stable detection, bt/ndk image tags) - #28
Closed
azlekov wants to merge 11 commits into
Closed
chore: merge upstream compscidr/main (SDK 37.2, empty-codename stable detection, bt/ndk image tags)#28azlekov wants to merge 11 commits into
azlekov wants to merge 11 commits into
Conversation
Update SDK/JDK versions
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Adds <runner>-jdkNN-sdkNN-ndkX.Y.Z next to the existing tag so downstream repos that pin an Android NDK (Gradle ndkVersion) can have Renovate derive it from the image tag and bump image and NDK together. The weekly SDK/NDK automation already rewrites ARG NDK_VERSION, so the tag follows it. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
deploy: also tag images with the NDK version they ship
…-tools Stable platforms since android-37.0 carry an empty <codename></codename> in Google's repository manifest, so is_preview() skipped every 37.x and the image stayed on platform 36.1. Only a non-empty codename marks a preview now. deploy also publishes <runner>-jdkNN-sdkX.Y-btX.Y.Z-ndkX.Y.Z so consumers can let Renovate derive compileSdk, buildToolsVersion and ndkVersion from the image pin; the existing -sdk-ndk tag is kept. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…d-bt-tag SDK check: treat an empty <codename> as stable; tag images with build-tools
Update SDK/JDK versions
… detection, bt/ndk image tags) Brings in upstream d79fa65: SDK bump to 37.2, empty <codename> treated as stable in check-sdk-updates, deploy tags images with NDK and build-tools versions (suffixed with -node<N> to keep the fork's node variants distinct), README tag examples. Dockerfile/deploy.yml/README customizations of the fork are preserved. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Author
|
folded into the combined refactor PR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Real merge of
upstream/main(compscidr) into the fork, so W1/W2/README sessions can rebase on it.Upstream commits merged
d79fa65Update SDK/JDK versions compscidr/docker-github-actions-runner-android#88 SDK version bump →COMPILE_SDK=37.2(Dockerfile)9263ec7SDK check: treat an empty <codename> as stable; tag images with build-tools compscidr/docker-github-actions-runner-android#87 SDK check treats empty<codename>as stable (check-sdk-updates.yml, auto-merged cleanly) + deploy tags images with build-tools1c0fc59README same-image tag examples23e506fdeploy: also tag images with the NDK version they ship compscidr/docker-github-actions-runner-android#86 deploy also tags images with NDK version60ac344myoung34 2.338.0 bump (already in fork — no-op)32af9bbJDK 27 (already in fork — no-op)Conflict resolutions
DockerfileARG NODE_VERSION=24; took upstreamCOMPILE_SDK=37.2. Nothing else touched (TAR_OPTIONS, hooks, preflight, RUNNER_IMAGE_* ARGs intact)..github/workflows/deploy.ymlghcr.io/dodi-smart, image identity. Took upstream'sBUILD_TOOLS/NDK_VERSIONextraction (build job auto-merged; added to the merge job too, since tags are generated there). Added upstream's-ndk<NDK>and-bt<BT>-ndk<NDK>tags, each suffixed with-node<N>like the fork's fully-pinned tag (otherwise node22/node24 variants would overwrite each other). Dropped upstream's un-suffixedjdk<N>/-sdktags andlatestrule — the fork's node-aware equivalents stay.matrix.jsondefault_jdkline; fork's structure (node_versions,default_node) kept. File is unchanged vsmain.README.mdsdk37.2and added the two new-ndk/-bt…-ndkrows plus a one-line rationale. No wholesale rewrite.check-sdk-updates.ymlVerification
shellcheck -x *.sh tests/*.sh✅bash tests/pruner-bun.shinubuntu:24.04✅ (PASS)actionlint✅ for workflow syntax/expressions; only pre-existing SC2086/SC2129 info shellcheck notes inrun:blocks (disabled-shellcheck run is clean)docker buildx build --check .✅ no warningsRebase notes for parallel sessions
COMPILE_SDK=36.1→37.2). Trivial rebase.deploy.ymlchanged (merge job now extractsbuild_tools/ndk_version;Docker metadatatag list gained two-ndk…-node<N>tags and the comments).check-sdk-updates.ymlchanged (codename parser, ~lines 107–130).matrix.jsonunchanged. Pruning to JDK 17/21/25/27 should not conflict.sdk36→sdk37.2; keep or drop as part of the rewrite.🤖 Generated with Claude Code