Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/check-sdk-updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ jobs:
fi

# Get latest available versions
LATEST_PLATFORM=$(echo "$PACKAGES" | grep 'platforms;android-' | grep -oP 'android-\K\d+' | sort -n | tail -1)
# Platform packages now use MAJOR.MINOR versioning (e.g. android-36.1,
# android-37.0). Capture the optional minor component and sort by version
# so we don't truncate "37.0" to a non-existent "platforms;android-37".
LATEST_PLATFORM=$(echo "$PACKAGES" | grep 'platforms;android-' | grep -oP 'android-\K[0-9]+(\.[0-9]+)?' | sort -V | tail -1)
LATEST_BUILD_TOOLS=$(echo "$PACKAGES" | grep 'build-tools;' | grep -oP 'build-tools;\K[0-9.]+' | sort -V | tail -1)
LATEST_NDK=$(echo "$PACKAGES" | grep -P '^\s+ndk;' | grep -oP 'ndk;\K[0-9.]+' | sort -V | tail -1)

Expand All @@ -92,7 +95,10 @@ jobs:

# Check if updates are needed
UPDATED=false
if [ -n "$LATEST_PLATFORM" ] && [ "$LATEST_PLATFORM" != "$CURRENT_PLATFORM" ] && [ "$LATEST_PLATFORM" -gt "$CURRENT_PLATFORM" ] 2>/dev/null; then
# Use version-aware comparison (not integer -gt) since platform versions
# can be MAJOR.MINOR. Update only when LATEST differs and sorts highest.
if [ -n "$LATEST_PLATFORM" ] && [ "$LATEST_PLATFORM" != "$CURRENT_PLATFORM" ] && \
[ "$(printf '%s\n%s\n' "$CURRENT_PLATFORM" "$LATEST_PLATFORM" | sort -V | tail -1)" = "$LATEST_PLATFORM" ]; then
UPDATED=true
fi
if [ -n "$LATEST_BUILD_TOOLS" ] && [ "$LATEST_BUILD_TOOLS" != "$CURRENT_BUILD_TOOLS" ]; then
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG VERSION=2.334.0-ubuntu-noble
ARG JAVA_VERSION=21
ARG COMPILE_SDK=37
ARG COMPILE_SDK=37.0
ARG BUILD_TOOLS=37.0.0
ARG NDK_VERSION=30.0.14904198
ARG SDK_TOOLS=8512546_latest
Expand Down