-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
19 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -187,11 +187,11 @@ jobs: | |
| sudo apt install git wget gcc-10 g++-10 ninja-build libxxf86vm-dev libxcb-glx0-dev libcjson-dev glslang-dev glslang-tools -y | ||
| # ubuntu-focal cmake package is too old... | ||
| CMAKE_FILE=cmake-3.27.7-linux-x86_64.sh | ||
| wget https://github.com/Kitware/CMake/releases/download/v3.27.7/${CMAKE_FILE} | ||
| CMAKE_FILE=cmake-3.30.5-linux-x86_64.sh | ||
| wget https://github.com/Kitware/CMake/releases/download/v3.30.5/${CMAKE_FILE} | ||
| chmod +x ${CMAKE_FILE} | ||
| ./${CMAKE_FILE} --skip-license --include-subdir | ||
| export PATH=${PWD}/cmake-3.27.7-linux-x86_64:$PATH | ||
| export PATH=${PWD}/cmake-3.30.5-linux-x86_64:$PATH | ||
| # ubuntu-focal glslang package is too old... | ||
| wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip | ||
|
|
@@ -253,11 +253,11 @@ jobs: | |
| sudo apt install git wget gcc-10 g++-10 ninja-build libxxf86vm-dev libxcb-glx0-dev libcjson-dev glslang-dev glslang-tools -y | ||
| # ubuntu-focal cmake package is too old... | ||
| CMAKE_FILE=cmake-3.27.7-linux-x86_64.sh | ||
| wget https://github.com/Kitware/CMake/releases/download/v3.27.7/${CMAKE_FILE} | ||
| CMAKE_FILE=cmake-3.30.5-linux-x86_64.sh | ||
| wget https://github.com/Kitware/CMake/releases/download/v3.30.5/${CMAKE_FILE} | ||
| chmod +x ${CMAKE_FILE} | ||
| ./${CMAKE_FILE} --skip-license --include-subdir | ||
| export PATH=${PWD}/cmake-3.27.7-linux-x86_64:$PATH | ||
| export PATH=${PWD}/cmake-3.30.5-linux-x86_64:$PATH | ||
| # ubuntu-focal glslang package is too old... | ||
| wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip | ||
|
|
@@ -418,9 +418,9 @@ jobs: | |
| needs: [prepare_release] | ||
| env: | ||
| RUST_BACKTRACE: 1 | ||
| ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.1.12297006 | ||
| ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.1.12297006 | ||
| ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.3/bin | ||
| ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018 | ||
| ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018 | ||
| ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.5/bin | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v3 | ||
|
|
@@ -440,7 +440,7 @@ jobs: | |
| sudo apt update && sudo apt upgrade -y | ||
| sudo apt install gcc-multilib | ||
| SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager | ||
| yes | sudo $SDK_MANAGER --install "ndk;27.1.12297006" "platforms;android-29" "cmake;3.30.3" | ||
| yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.30.5" | ||
| rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android | ||
| cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries | ||
|
|
@@ -491,9 +491,9 @@ jobs: | |
| needs: [prepare_release] | ||
| env: | ||
| RUST_BACKTRACE: 1 | ||
| ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.1.12297006 | ||
| ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.1.12297006 | ||
| ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.3/bin | ||
| ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/27.2.12479018 | ||
| ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/27.2.12479018 | ||
| ANDROID_CMAKE_BIN: /usr/local/lib/android/sdk/cmake/3.30.5/bin | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v3 | ||
|
|
@@ -514,7 +514,7 @@ jobs: | |
| sudo apt update && sudo apt upgrade -y | ||
| sudo apt install gcc-multilib | ||
| SDK_MANAGER=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager | ||
| yes | sudo $SDK_MANAGER --install "ndk;27.1.12297006" "platforms;android-29" "cmake;3.30.3" | ||
| yes | sudo $SDK_MANAGER --install "ndk;27.2.12479018" "platforms;android-29" "cmake;3.30.5" | ||
| rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android | ||
| cargo install cargo-apk --git https://github.com/korejan/cargo-apk.git --branch android-manifest-entries | ||
|
|
@@ -591,7 +591,7 @@ jobs: | |
| vulkan-query-version: latest | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang | ||
| vulkan-use-cache: true | ||
| # - uses: Jimver/[email protected].15 | ||
| # - uses: Jimver/[email protected].18 | ||
| # id: cuda-toolkit | ||
| # with: | ||
| # method: 'network' | ||
|
|
@@ -648,11 +648,11 @@ jobs: | |
| vulkan-query-version: latest | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang | ||
| vulkan-use-cache: true | ||
| - uses: Jimver/[email protected].15 | ||
| - uses: Jimver/[email protected].18 | ||
| id: cuda-toolkit | ||
| with: | ||
| method: 'network' | ||
| cuda: '12.2.0' | ||
| cuda: '12.6.2' | ||
| # sub-packages: '["nvcc", "visual_studio_integration"]' | ||
|
|
||
| - name: Build and install ALXR dependencies | ||
|
|
@@ -721,11 +721,11 @@ jobs: | |
| vulkan-query-version: latest | ||
| vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang | ||
| vulkan-use-cache: true | ||
| - uses: Jimver/[email protected].15 | ||
| - uses: Jimver/[email protected].18 | ||
| id: cuda-toolkit | ||
| with: | ||
| method: 'network' | ||
| cuda: '12.2.0' | ||
| cuda: '12.6.2' | ||
| # sub-packages: '["nvcc", "visual_studio_integration"]' | ||
|
|
||
| - name: Build and install ALXR dependencies | ||
|
|
||