Skip to content

Commit

Permalink
Ensure android NDK is installed regardless of runner.
Browse files Browse the repository at this point in the history
This fixes the workflow on runner images where the NDK is not
installed. It bundles together a few other changes to ensure
CMake is executed correctly and make it easier to diff CMake
log in the GHA UI with the content in swift-toolchain.yml

* Always run gha-setup-vsdevenv even if runners.os != 'Windows'
  * It provides us with the path to CMake
* Switch to nttdl/setup-ndk to install the Android NDK.
* Always specify Android-specific MAKE defines, but enable others
  iff matrix.os == Android.
  * CMAKE_SYSTEM_NAME=${{ matrix.os }} controls which system we're
    building for, so there's no need to use matrix.extra_flags for
    Android-specific defines. Inlining them ensures powershell
    variable expansion works, and makes it easier to copy paste
    CMake commands for for local reproduction.
  • Loading branch information
kendal committed Jun 28, 2024
1 parent 46d54f3 commit 3bea8a2
Showing 1 changed file with 114 additions and 70 deletions.
Loading

0 comments on commit 3bea8a2

Please sign in to comment.