Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): switch back to upstream setup-android #181

Merged
merged 1 commit into from
Apr 29, 2022

Conversation

mikehardy
Copy link
Member

@mikehardy mikehardy commented Apr 29, 2022

This was originally to bring in a more up-to-date command-line tools, fixing
the bundled sdkmanager's problems with JDK11. The best action in the community
was not quite up to date so I made a local change, but now the PR is merged and released,
so back to upstream, excellent

See android-actions/setup-android#272

Test plan: make sure there are no instances of my fork ref left over, and CI passes:

mike@bistromath:~/work/AnkiDroid/Anki-Android-Backend (upstream-setup-android) % grep -r setup-android .github/workflows/
.github/workflows/update_gradle_wrapper.yml:      uses: android-actions/setup-android@v2
.github/workflows/windows_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/windows_pure_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/robolectric_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/robolectric_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/macos_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/macos_build.yml:      uses: android-actions/setup-android@v2
.github/workflows/publish_testing.yml:      uses: android-actions/setup-android@v2
.github/workflows/publish_library.yml:      uses: android-actions/setup-android@v2
.github/workflows/linux_build.yml:      uses: android-actions/setup-android@v2
mike@bistromath:~/work/AnkiDroid/Anki-Android-Backend (upstream-setup-android) % 

This was originally to bring in a more up-to-date command-line tools, fixing
the bundled sdkmanager's problems with JDK11. The best action in the community
was not quite up to date so I made a local change, but now the PR is merged and released,
so back to upstream, excellent

See android-actions/setup-android#272
@mikehardy mikehardy added the pending-merge Waiting on CI or question responses to merge, but otherwise ready label Apr 29, 2022
@mikehardy mikehardy merged commit 7ca7249 into ankidroid:main Apr 29, 2022
@mikehardy mikehardy deleted the upstream-setup-android branch April 29, 2022 14:35
@mikehardy mikehardy removed the pending-merge Waiting on CI or question responses to merge, but otherwise ready label Apr 29, 2022
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.

1 participant