diff --git a/.github/workflows/vvl_sc.yml b/.github/workflows/vvl_sc.yml index 7e52870c7..85ff7b087 100644 --- a/.github/workflows/vvl_sc.yml +++ b/.github/workflows/vvl_sc.yml @@ -56,10 +56,6 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.10' - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: vksc-${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}-${{ matrix.cxx }} - name: Install build dependencies run: | python3 -m pip install jsonschema pyparsing @@ -100,10 +96,6 @@ jobs: sudo apt-get install -y libxkbcommon-dev libwayland-dev libmirclient-dev libxrandr-dev \ libx11-xcb-dev libxcb-keysyms1 libxcb-keysyms1-dev libxcb-ewmh-dev \ libxcb-randr0-dev - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: vksc-${{ runner.os }}-release-cpp20 # Turn on ccache this way, which is easier than figuring out how to turn it on for all deps # PATH changes need to be done in an action before any action that needs it - name: Add ccache to PATH @@ -141,27 +133,6 @@ jobs: - name: Install build dependencies run: | python3 -m pip install jsonschema pyparsing - - name: Cache dependent components - # Speed up builds by caching the build/install artifacts so they can be retrieved without rebuilding. - # Note: Normally the build/install artifacts are enough to satisfy the dependencies. - # But in this repo, there are extra tests and steps that require files that are not placed in build/install. - # When adding new similar tests, make sure to add any other required directories/files to the cache list. - id: cache-deps - uses: actions/cache@v3 - env: - cache-name: cache-vksc-windows - with: - path: | - external/${{ matrix.config }}/glslang/build/install - external/${{ matrix.config }}/Vulkan-Headers/build/install - external/${{ matrix.config }}/SPIRV-Headers/build/install - external/${{ matrix.config }}/SPIRV-Tools/build/install - external/${{ matrix.config }}/robin-hood-hashing/build/install - external/${{ matrix.config }}/googletest/build/install - external/${{ matrix.config }}/Vulkan-Headers/registry - external/${{ matrix.config }}/SPIRV-Headers/include - external/${{ matrix.config }}/mimalloc/build/install - key: vksc-${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.config }}-${{ hashfiles('scripts/known_good.json') }} - name: Set PYTHONPATH run: echo "PYTHONPATH=$env:GITHUB_WORKSPACE\\external\\${{ matrix.config }}\\Vulkan-Headers\\registry;$env:PYTHONPATH" >> $env:GITHUB_ENV - name: Build VulkanSC-ValidationLayers @@ -181,23 +152,6 @@ jobs: python-version: '3.10' - name: Install build dependencies run: python -m pip install jsonschema pyparsing - - name: Cache dependent components - id: cache-deps - uses: actions/cache@v3 - env: - cache-name: cache-vksc-mingw - with: - path: | - external/Debug/glslang/build/install - external/Debug/Vulkan-Headers/build/install - external/Debug/SPIRV-Headers/build/install - external/Debug/SPIRV-Tools/build/install - external/Debug/robin-hood-hashing/build/install - external/Debug/googletest/build/install - external/Debug/Vulkan-Headers/registry - external/Debug/SPIRV-Headers/include - external/Debug/mimalloc/build/install - key: vksc-mingw-Debug-${{ hashfiles('scripts/known_good.json') }} - uses: lukka/get-cmake@latest - name: GCC Version run: gcc --version # If this fails MINGW is not setup correctly