-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' of https://github.com/LuisaGroup/LuisaRender into…
… next
- Loading branch information
Showing
1 changed file
with
21 additions
and
10 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 |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ ubuntu-22.04 ] | ||
| os: [ ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04 ] | ||
| compiler: | ||
| - { name: gcc, version: 11 } | ||
| # - { name: gcc, version: 12 } | ||
|
|
@@ -41,12 +41,23 @@ jobs: | |
| sudo apt-get update | ||
| sudo apt-get -y install build-essential cmake ninja-build uuid-dev libxinerama-dev libxcursor-dev libxi-dev libvulkan-dev libxkbcommon-dev | ||
| curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y | ||
| - name: "Download CUDA Keyring (ubuntu-24.04)" | ||
| if: matrix.os == 'ubuntu-24.04' | ||
| run: | | ||
| wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb | ||
| - name: "Download CUDA Keyring (ubuntu-24.04-arm)" | ||
| if: matrix.os == 'ubuntu-24.04-arm' | ||
| run: | | ||
| wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/sbsa/cuda-keyring_1.1-1_all.deb | ||
| - name: "Download CUDA Keyring (ubuntu-22.04)" | ||
| if: matrix.os == 'ubuntu-22.04' | ||
| run: | | ||
| wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb | ||
| - name: "Setup CUDA" | ||
| run: | | ||
| wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb | ||
| sudo dpkg -i cuda-keyring_1.0-1_all.deb | ||
| sudo dpkg -i cuda-keyring_1.1-1_all.deb | ||
| sudo apt-get update | ||
| sudo apt-get -y install cuda-12.1 | ||
| sudo apt-get -y install cuda-12.8 | ||
| - name: "Setup Vulkan SDK" | ||
| uses: humbletim/[email protected] | ||
| with: | ||
|
|
@@ -64,15 +75,15 @@ jobs: | |
| export LUISA_CXX=clang++-${{ matrix.compiler.version }} | ||
| export LUISA_FLAGS="-stdlib=libc++" | ||
| fi | ||
| cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=${{ matrix.config }} -D CMAKE_C_COMPILER=${LUISA_CC} -D CMAKE_CXX_COMPILER=${LUISA_CXX} -D CMAKE_CXX_FLAGS="${LUISA_FLAGS}" | ||
| cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=${{ matrix.config }} -D CMAKE_C_COMPILER=${LUISA_CC} -D CMAKE_CXX_COMPILER=${LUISA_CXX} -D CMAKE_CXX_FLAGS="${LUISA_FLAGS}" -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON | ||
| cmake --build build | ||
| - name: "Install" | ||
| if: matrix.config == 'Release' | ||
| run: | | ||
| sudo cmake --install build --prefix dist -v | ||
| - name: "Upload Artifact" | ||
| if: matrix.config == 'Release' | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| path: "dist/bin" | ||
| name: LuisaRender-${{ matrix.os }}-${{ matrix.compiler.name }}-${{ matrix.compiler.version }} | ||
|
|
@@ -81,7 +92,7 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ macos-13, macos-14 ] | ||
| os: [ macos-13, macos-14, macos-15 ] | ||
| compiler: [ homebrew-clang ] | ||
| config: [ Release, Debug ] | ||
| name: "${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}" | ||
|
|
@@ -110,7 +121,7 @@ jobs: | |
| sudo cmake --install build --prefix dist -v | ||
| - name: "Upload Artifact" | ||
| if: matrix.config == 'Release' | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| path: "dist/bin" | ||
| name: LuisaRender-${{ matrix.os }}-${{ matrix.compiler }} | ||
|
|
@@ -129,7 +140,7 @@ jobs: | |
| with: | ||
| submodules: recursive | ||
| - name: "Setup CUDA" | ||
| uses: Jimver/cuda-toolkit@v0.2.19 | ||
| uses: Jimver/cuda-toolkit@master | ||
| with: | ||
| cuda: 12.1.0 | ||
| - name: "Setup Ninja" | ||
|
|
@@ -158,7 +169,7 @@ jobs: | |
| cmake --install build --prefix dist -v | ||
| - name: "Upload Artifact" | ||
| if: matrix.config == 'Release' | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| path: "dist/bin" | ||
| name: LuisaRender-windows-${{ matrix.os }}-${{ matrix.compiler }} | ||