mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-08 19:40:06 +00:00
Cleanup MacOS CI
* ci: Test macos-12 and macos-13 instead of macos-11 and macos-12 Developer survey shows little to no users still use MacOS 11 or earlier. * Remove pointless comment about travis * Fix minor indent issue
This commit is contained in:
parent
a7b18c08d0
commit
b3c8e99b68
30
.github/workflows/continuous_integration.yml
vendored
30
.github/workflows/continuous_integration.yml
vendored
@ -1,9 +1,3 @@
|
||||
# NOTE: This workflow was ported from Travis.
|
||||
# Travis was using Ubuntu 14.04. Ubuntu 14.04 is not supportted by GitHub workflows. Ubuntu 20.04 is recommended.
|
||||
# Travis was using Clang 3.6. The earliest version support by Ubuntu 20.04 is Clang 6.0.
|
||||
# Travis was caching the clang package. APT package caching is not natively supported by GitHub actions/cache.
|
||||
# Travis was using Mac OS X 10.13.6 / Xcode 9.4.1 / LLVM 9.1.0
|
||||
#
|
||||
name: Continuous Integration
|
||||
|
||||
on:
|
||||
@ -89,7 +83,7 @@ jobs:
|
||||
- name: Test (standalone)
|
||||
run: cd Test && ./runtests
|
||||
|
||||
# Ensure we can compile/run on an older distro
|
||||
# Ensure we can compile/run on an older distro
|
||||
linux_min:
|
||||
name: Linux Backcompat
|
||||
runs-on: ubuntu-20.04
|
||||
@ -125,29 +119,23 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [macos-11, macos-12]
|
||||
os: [macos-12, macos-13]
|
||||
compiler: [{cc: clang, cxx: clang++}, {cc: gcc, cxx: g++}]
|
||||
cmake_build_type: [Debug, Release]
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
|
||||
with:
|
||||
python-version: '3.7'
|
||||
- uses: lukka/get-cmake@8be6cca406b575906541e8e3b885d46f416bba39 # v3.27.7
|
||||
- run: ./update_glslang_sources.py
|
||||
- name: Configure
|
||||
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G "Ninja"
|
||||
- run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G Ninja
|
||||
env:
|
||||
CC: ${{matrix.compiler.cc}}
|
||||
CXX: ${{matrix.compiler.cxx}}
|
||||
- name: Build
|
||||
run: cmake --build build
|
||||
- name: Install
|
||||
run: cmake --install build --prefix build/install
|
||||
- name: Test
|
||||
run: ctest --output-on-failure --test-dir build
|
||||
- name: Test (standalone)
|
||||
run: cd Test && ./runtests
|
||||
- run: cmake --build build
|
||||
- run: cmake --install build --prefix build/install
|
||||
- run: ctest --output-on-failure --test-dir build
|
||||
- name: Test Script (standalone)
|
||||
run: ./runtests
|
||||
working-directory: Test
|
||||
|
||||
windows:
|
||||
runs-on: ${{matrix.os.genus}}
|
||||
|
Loading…
Reference in New Issue
Block a user