Skip to content

Commit

Permalink
Do not compile SPIR-V shaders in CI.
Browse files Browse the repository at this point in the history
It's best to have a consistent compiler and build everything locally.
  • Loading branch information
zlogic committed Jan 28, 2024
1 parent 2e41e4c commit 814d413
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/cargo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,9 @@ jobs:
${{ github.workspace }}/target
key: lint-${{ runner.os }}-${{ steps.get-rust-version.outputs.VERSION }}-${{ hashFiles('Cargo.lock') }}

- name: Install glslang
run: sudo apt install glslang-tools

- name: Build SPIR-V shaders with glslang
run: (cd src/correlation/shaders && ./compile-spirv.sh)

- name: Validate Rust code with clippy
run: cargo clippy

- name: Upload SPIR-V shaders
uses: actions/upload-artifact@v4
with:
name: shaders-spv
path: src/correlation/shaders/*.spv

build-linux:
# Older Ubuntu versions will link with an older GLIBC and provide better compatibility
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -88,11 +76,6 @@ jobs:
echo "CFLAGS=-march=armv8.2-a" >> $GITHUB_ENV
echo "CXXFLAGS=-march=armv8.2-a" >> $GITHUB_ENV
- name: Download SPIR-V shaders
uses: actions/download-artifact@v4
with:
name: shaders-spv

- name: Build
run: cargo build --target=${{ matrix.arch }}-unknown-linux-gnu --release

Expand Down Expand Up @@ -137,11 +120,6 @@ jobs:
if: matrix.arch == 'aarch64'
run: rustup target add ${{ matrix.arch }}-pc-windows-msvc

- name: Download SPIR-V shaders
uses: actions/download-artifact@v4
with:
name: shaders-spv

- name: Build
run: |
$Env:RUSTFLAGS = "-C target-feature=+crt-static"
Expand Down

0 comments on commit 814d413

Please sign in to comment.