diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 55c571252..05b070f7d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -68,8 +68,8 @@ jobs: id: cache_ndk uses: actions/cache@v2 with: - path: /tmp/android-ndk-r16b - key: android-ndk-${{ matrix.os }}-r16b + path: /tmp/android-ndk-r21e + key: android-ndk-${{ matrix.os }}-r21e - name: Install Unity installer (U3D) shell: bash diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index a862ac961..785113045 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -87,8 +87,8 @@ jobs: id: cache_ndk uses: actions/cache@v2 with: - path: /tmp/android-ndk-r16b - key: android-ndk-${{ matrix.os }}-r16b + path: /tmp/android-ndk-r21e + key: android-ndk-${{ matrix.os }}-r21e - name: Install Unity installer (U3D) shell: bash diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 784f9eb1c..b042519e8 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -83,12 +83,12 @@ _WINDOWS: { "version": "2020.3.34f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" }, _MACOS: { "version": "2020.3.34f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip" }, _LINUX: { "version": "2020.3.29f1", @@ -99,12 +99,12 @@ _WINDOWS: { "version": "2019.4.39f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": ["Mac-mono"], "Linux": ["Linux-mono"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" }, _MACOS: { "version": "2019.4.39f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip" }, _LINUX: { "version": "2019.4.39f1", @@ -115,12 +115,12 @@ _WINDOWS: { "version": "2018.4.36f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-il2cpp"], "macOS": ["Mac-mono"], "Linux": ["Linux"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" }, _MACOS: { "version": "2018.4.36f1", "packages": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": ["Mac-il2cpp"], "Linux": ["Linux"]}, - "ndk": "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip" + "ndk": "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip" }, _LINUX: { "version": "2018.3.0f2",