Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike-Leo-Smith committed Apr 20, 2024
1 parent 432d780 commit 793165e
Showing 1 changed file with 20 additions and 14 deletions.
34 changes: 20 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- { name: clang, version: 16 }
- { name: clang, version: 17 }
config: [ Release, Debug ]
name: ${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler.name }}-${{ matrix.compiler.version }}
name: "${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler.name }}-${{ matrix.compiler.version }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: "Install Dependencies"
Expand All @@ -40,12 +40,16 @@ 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: "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 apt-get update
# sudo apt-get -y install cuda-12.1
- 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 apt-get update
sudo apt-get -y install cuda
uses: Jimver/[email protected]
with:
cuda: 12.1.0
- name: "Setup Vulkan SDK"
uses: humbletim/[email protected]
with:
Expand Down Expand Up @@ -80,13 +84,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-13 ]
os: [ macos-13, macos-14 ]
compiler: [ homebrew-clang ]
config: [ Release, Debug ]
name: ${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}
name: "${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: "Install Dependencies"
Expand Down Expand Up @@ -123,18 +127,20 @@ jobs:
os: [ 2019, 2022 ]
config: [ Release, Debug ]
compiler: [ cl, clang, clang-cl ]
name: windows-${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}
name: "windows-${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}"
runs-on: windows-${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: "Setup CUDA"
uses: Jimver/[email protected]
uses: Jimver/[email protected]
with:
cuda: 12.1.0
- name: "Setup Ninja"
uses: ashutoshvarma/setup-ninja@master
with:
version: 1.10.2
version: 1.11.1
- name: "Setup Vulkan SDK"
uses: humbletim/[email protected]
with:
Expand Down

0 comments on commit 793165e

Please sign in to comment.