diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a5ba97441..12f698994 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,4 +1,4 @@ -# Copyright 2021-2024 The Khronos Group Inc. +# Copyright 2021-2025 The Khronos Group Inc. # SPDX-License-Identifier: Apache-2.0 # GitHub CI file for vulkan spec and header generation @@ -135,61 +135,6 @@ jobs: name: hpp-outputs path: gen/include/ - ash-generate: - name: Generate Rust bindings (Ash crate) - runs-on: ubuntu-latest - needs: spec-generate - continue-on-error: true - env: - # Cached folder outside of git repo - CARGO_TARGET_DIR: ${{ github.workspace }}/ash-target - - steps: - - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - repository: ash-rs/ash - path: ash - - uses: actions/cache@v4 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - ash-target/ - key: ${{ runner.os }}-cargo-ash-generator-${{ hashFiles('**/Cargo.toml', '.github/workflows/CI.yml') }} - restore-keys: | - ${{ runner.os }}-cargo-ash-generator- - - name: Download generated spec - uses: actions/download-artifact@v4 - with: - name: spec-outputs - - name: Unpack generated spec - run: tar -xvf spec-outputs.tar - - name: Prepare environment - working-directory: ash - run: | - # Piece together minimal Vulkan-Headers - Ash only needs headers and vk.xml - rm -rf generator/Vulkan-Headers/* # Should already be empty, just in case - ln -s ${{ github.workspace }}/gen/include generator/Vulkan-Headers/ # Complete headers come from spec-generate - ln -s ${{ github.workspace }}/xml generator/Vulkan-Headers/registry # vk.xml sits in the root of this spec repo - - - name: Generate Ash crate - working-directory: ash - run: | - cargo run -p generator - cargo fmt --all - - - name: Package generated Ash crate - # https://github.com/actions/upload-artifact#limitations, see above - run: tar -cvf ash-outputs.tar ash/ - - name: Upload generated ash - uses: actions/upload-artifact@v4 - with: - name: ash-outputs - path: ash-outputs.tar - # Run the CTS Vulkan framework tests, to make sure XML changes will not # cause problems there. cts-framework-tests: @@ -262,31 +207,3 @@ jobs: - run: | g++ -c -std=c++11 -Igen/include -IVulkan-Hpp -Wall -Wextra -Werror tests/hpptest.cpp clang++ -c -std=c++11 -Igen/include -IVulkan-Hpp -Wall -Wextra -Werror tests/hpptest.cpp - - ash-compile: - name: Build-test Rust bindings (Ash crate) - runs-on: ubuntu-latest - needs: ash-generate - continue-on-error: true - - steps: - - name: Download generated files - uses: actions/download-artifact@v4 - with: - name: ash-outputs - - name: Unpack generated Ash crate - run: tar -xvf ash-outputs.tar - - uses: actions/cache@v4 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/index/ - ~/.cargo/registry/cache/ - ~/.cargo/git/db/ - ash/target/ - key: ${{ runner.os }}-cargo-ash-compile-${{ hashFiles('**/Cargo.toml', '.github/workflows/CI.yml') }} - restore-keys: | - ${{ runner.os }}-cargo-ash-compile- - - name: Build-test ash crate - working-directory: ash - run: cargo clippy --all --all-targets