Skip to content

Conversation

gillamkid
Copy link
Contributor

Reason Fix is Needed

"android-35-ext15" was just added and it broke Android CI. Instead of adding a new uninstall command for "android-35-ext15" I made a command which uninstalls anything following the pattern android-* (except for android-33)

Sponsor

This contribution was sponsored by Firestorm
654d4f9476ff2a38f37e9ab9_firestorm-homepage-share-img-2

For example, "android-35-ext15" was just added and it broke CI. Instead of adding a new uninstall command for "android-35-ext15" I made a command which uninstalls anything following the pattern android-* (except for android-33)
@DonLakeFlyer
Copy link
Contributor

Doesn't this need to be in master as well?

@gillamkid
Copy link
Contributor Author

gillamkid commented Apr 4, 2025

Doesn't this need to be in master as well?

I don't think so. On master the CI .yml files for Android have changed quite a bit and master does not appear to run uninstall to remove unused Android SDKs. Here is the equivalent section of code on mater

- name: Install Android NDK
uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r26d
add-to-path: false
- run: |
echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
echo "ANDROID_NDK=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
shell: bash
- name: Update Android SDK / NDK / Tools
if: ${{ runner.os != 'Windows' }}
run: sdkmanager --update
shell: bash

I'm not sure what masteris doing to avoid the need to run the uninstall commands (maybe it's setting the right set of environment variables??) but I would say the change I've suggested in this PR is prolly the smallest/easiest/least-intrusive change that will keep the Android CI build of Stable_V4.4 working (whereas now it repeatedly breaks as Android releases new SDKs)

@HTRamsey
Copy link
Collaborator

HTRamsey commented Apr 7, 2025

Doesn't this need to be in master as well?

No, I've got it set up so this no longer matters

@HTRamsey HTRamsey requested a review from julianoes April 7, 2025 05:57
Copy link
Contributor

@julianoes julianoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, that makes a lot more sense!

@julianoes julianoes merged commit a4a1e1d into mavlink:Stable_V4.4 Apr 7, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants