Skip to content

Commit

Permalink
ci: Remove Ubuntu 20.04 check
Browse files Browse the repository at this point in the history
The new SPIRV-Tools needs 3.22.1 cmake now
  • Loading branch information
spencer-lunarg committed Jan 23, 2025
1 parent cf2967a commit 6cf616f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 30 deletions.
28 changes: 2 additions & 26 deletions .github/workflows/vvl.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) 2021-2024 Valve Corporation
# Copyright (c) 2021-2024 LunarG, Inc.
# Copyright (c) 2021-2025 Valve Corporation
# Copyright (c) 2021-2025 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -49,30 +49,6 @@ jobs:
- name: Execute Source Code Format Checking Script
run: python3 scripts/check_code_format.py --fetch-main --target-refspec=FETCH_HEAD

# Ensure we can build on an older Ubuntu distro with an older version of CMake.
linux_back_compat:
needs: check_vvl
runs-on: ubuntu-20.04
name: "Ubuntu Backcompat"
steps:
- uses: actions/checkout@v4
- name: Test Minimum CMake Version
uses: lukka/get-cmake@latest
with:
cmakeVersion: 3.17.2
- uses: hendrikmuhs/ccache-action@v1.2
with:
key: linux_back_compat
- run: sudo apt-get -qq update && sudo apt-get install -y libwayland-dev xorg-dev
- run: cmake -S . -B build/ -D UPDATE_DEPS=ON -D CMAKE_BUILD_TYPE=Debug
env:
CMAKE_C_COMPILER_LAUNCHER: ccache
CMAKE_CXX_COMPILER_LAUNCHER: ccache
# Linker warnings as errors
LDFLAGS: -Wl,--fatal-warnings
- run: cmake --build build
- run: cmake --install build --prefix /tmp

linux:
needs: check_vvl
runs-on: ubuntu-22.04
Expand Down
4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

## Requirements

1. CMake >= 3.17.2
1. CMake >= 3.22.1
2. C++17 compatible toolchain
3. Git
4. Python >= 3.10
Expand Down Expand Up @@ -173,7 +173,7 @@ See the [CMake documentation](https://cmake.org/cmake/help/latest/generator/Xcod

## Building For Android

- CMake 3.21+
- CMake 3.22.1+
- NDK r25+
- Ninja 1.10+
- Android SDK Build-Tools 34.0.0+
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ~~~
cmake_minimum_required(VERSION 3.17.2)
cmake_minimum_required(VERSION 3.22.1)

project(VVL LANGUAGES CXX)

Expand Down Expand Up @@ -85,7 +85,7 @@ if (VVL_ENABLE_TRACY)
message(FATAL_ERROR "Tracy cannot be used with mimalloc")
endif()

if (VVL_TRACY_CALLSTACK STREQUAL "OFF")
if (VVL_TRACY_CALLSTACK STREQUAL "OFF")
set(VVL_TRACY_CALLSTACK 48)
endif()

Expand Down

0 comments on commit 6cf616f

Please sign in to comment.