From 40b8f661461d6aec0dfbd727586e39fbe295b528 Mon Sep 17 00:00:00 2001 From: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com> Date: Fri, 10 Feb 2023 13:44:57 +0100 Subject: [PATCH] Fix `setup-dxc` not found and make sure workflows run if their file was changed (#2247) * fix setup-dxc not found * run validation-windows if its workflow file was changed * run validation-macos if its workflow file was changed * run validation-linux if its workflow file was changed * run lazy if its workflow file was changed --- .github/workflows/lazy.yml | 3 +++ .github/workflows/validation-linux.yml | 11 ++++++----- .github/workflows/validation-macos.yml | 3 ++- .github/workflows/validation-windows.yml | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lazy.yml b/.github/workflows/lazy.yml index 6bdb83c80e..ab5e21f129 100644 --- a/.github/workflows/lazy.yml +++ b/.github/workflows/lazy.yml @@ -3,6 +3,9 @@ name: lazy on: push: branches: [master] + pull_request: + paths: + - '.github/workflows/lazy.yml' env: CARGO_INCREMENTAL: false diff --git a/.github/workflows/validation-linux.yml b/.github/workflows/validation-linux.yml index 8da38da7b8..e253e0a42e 100644 --- a/.github/workflows/validation-linux.yml +++ b/.github/workflows/validation-linux.yml @@ -2,11 +2,12 @@ name: validation-linux on: pull_request: paths: - - 'tests/out/spv/*.spvasm' - - 'tests/out/glsl/*.glsl' - - 'tests/out/dot/*.dot' - - 'tests/out/wgsl/*.wgsl' - - 'src/front/wgsl/*' + - '.github/workflows/validation-linux.yml' + - 'tests/out/spv/*.spvasm' + - 'tests/out/glsl/*.glsl' + - 'tests/out/dot/*.dot' + - 'tests/out/wgsl/*.wgsl' + - 'src/front/wgsl/*' jobs: validate-linux: diff --git a/.github/workflows/validation-macos.yml b/.github/workflows/validation-macos.yml index 2ec185ea04..535a0622b3 100644 --- a/.github/workflows/validation-macos.yml +++ b/.github/workflows/validation-macos.yml @@ -2,7 +2,8 @@ name: validation-macos on: pull_request: paths: - - 'tests/out/msl/*.msl' + - '.github/workflows/validation-macos.yml' + - 'tests/out/msl/*.msl' jobs: validate-macos: diff --git a/.github/workflows/validation-windows.yml b/.github/workflows/validation-windows.yml index da6fe70657..03942a6782 100644 --- a/.github/workflows/validation-windows.yml +++ b/.github/workflows/validation-windows.yml @@ -2,6 +2,7 @@ name: validation-windows on: pull_request: paths: + - '.github/workflows/validation-windows.yml' - 'tests/out/hlsl/*.hlsl' jobs: @@ -12,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - name: Add DirectXShaderCompiler - uses: napokue/setup-dxc@v1.1 + uses: napokue/setup-dxc@v1.1.0 - run: make validate-hlsl-dxc shell: sh @@ -33,4 +34,4 @@ jobs: shell: powershell - run: make validate-hlsl-fxc - shell: sh \ No newline at end of file + shell: sh