Skip to content

Commit c0c98f1

Browse files
committed
skip building vkvia, fix another env var on windows
1 parent 9efdbe5 commit c0c98f1

File tree

2 files changed

+1
-43
lines changed

2 files changed

+1
-43
lines changed

.github/workflows/test-action.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -23,48 +23,6 @@ jobs:
2323
- uses: ./
2424
with:
2525
version: ${{ matrix.vulkan }}
26-
- name: Build Vulkan Installation Analyzer
27-
if: ${{ runner.os == 'Linux' }}
28-
run: |
29-
sudo apt-get update
30-
sudo apt-get install libglm-dev cmake libxcb-dri3-0 libxcb-present0 libpciaccess0 \
31-
libpng-dev libxcb-keysyms1-dev libxcb-dri3-dev libx11-dev g++ gcc \
32-
libwayland-dev libxrandr-dev libxcb-randr0-dev libxcb-ewmh-dev \
33-
git python-is-python3 bison libx11-xcb-dev liblz4-dev libzstd-dev \
34-
ocaml-core ninja-build pkg-config libxml2-dev wayland-protocols python3-jsonschema \
35-
clang-format qtbase5-dev qt6-base-dev
36-
37-
$VULKAN_SDK/vulkansdk --maxjobs lunarg-tools
38-
39-
# We need to roughly duplicate what the SDK script does here because it doesn't specify BUILD_VIA
40-
SDKDIR="$(dirname "${VULKAN_SDK}")"
41-
ARCH="$(uname -m)"
42-
ARCHDIR="${SDKDIR}/${ARCH}"
43-
SOURCEDIR="${SDKDIR}"/source
44-
45-
LGVT_DIR="${SOURCEDIR}"/VulkanTools
46-
JSONCPP_DIR="${SOURCEDIR}"/jsoncpp
47-
VALIJSON_DIR="${SOURCEDIR}"/valijson
48-
49-
BUILD_DIR="build"
50-
BUILD_RELDEBINFO_TYPE="RelWithDebInfo"
51-
52-
NUMJOBS="$(expr $(nproc) - 1)"
53-
54-
cmake -S "${LGVT_DIR}" \
55-
-B "${LGVT_DIR}/${BUILD_DIR}" \
56-
-DCMAKE_BUILD_TYPE="$BUILD_RELDEBINFO_TYPE" \
57-
-DCMAKE_INSTALL_LIBDIR="lib" \
58-
-DVULKAN_HEADERS_INSTALL_DIR="$ARCHDIR" \
59-
-DVULKAN_LOADER_INSTALL_DIR="$ARCHDIR" \
60-
-DVULKAN_UTILITY_LIBRARIES_INSTALL_DIR="$ARCHDIR" \
61-
-DJSONCPP_INSTALL_DIR="${JSONCPP_DIR}/${BUILD_DIR}/install/" \
62-
-DVALIJSON_INSTALL_DIR="${VALIJSON_DIR}/${BUILD_DIR}/install/" \
63-
-DBUILD_TESTS="OFF" \
64-
-DBUILD_VIA="ON" \
65-
--install-prefix "$ARCHDIR"
66-
cmake --build "${LGVT_DIR}/${BUILD_DIR}" -j $NUMJOBS
67-
cmake --install "${LGVT_DIR}/${BUILD_DIR}"
6826
- name: Verify SDK install
6927
run: |
7028
if [[ -x "$(command -v vkvia)" ]]; then

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ runs:
8585
shell: bash
8686
if: ${{ runner.os == 'macOS' }}
8787
- run: |
88-
$VULKAN_SDK="$RUNNER_TOOL_CACHE\\vulkan\\${{ inputs.version == 'latest' && steps.determineSdkVersion.outputs.sdkVersion || inputs.version }}"
88+
$VULKAN_SDK="${Env:RUNNER_TOOL_CACHE}\\vulkan\\${{ inputs.version == 'latest' && steps.determineSdkVersion.outputs.sdkVersion || inputs.version }}"
8989
echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV
9090
echo "$VULKAN_SDK\\Bin" >> $GITHUB_PATH
9191
echo "VK_LAYER_PATH=$VULKAN_SDK\\Bin" >> $GITHUB_ENV

0 commit comments

Comments
 (0)