Update vcpkg & switch back to ubuntu 18.04 in workflow (#1161)

This commit is contained in:
Marcin Michalski 2021-08-22 01:21:17 +02:00 committed by GitHub
parent 10100342b9
commit e0d5b7d7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,7 +23,7 @@ on:
jobs: jobs:
job: job:
name: ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }} name: ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}
runs-on: ${{ matrix.os }}-latest runs-on: ${{ matrix.os }}-${{ matrix.os-version }}
strategy: strategy:
fail-fast: false fail-fast: false
max-parallel: 8 max-parallel: 8
@ -34,6 +34,7 @@ jobs:
include: include:
- name: windows-msvc - name: windows-msvc
os: windows os: windows
os-version: latest
cxx: cl.exe cxx: cl.exe
cc: cl.exe cc: cl.exe
triplet: x64-windows triplet: x64-windows
@ -42,6 +43,7 @@ jobs:
glew luajit libogg libvorbis openal-soft opengl openssl physfs zlib glew luajit libogg libvorbis openal-soft opengl openssl physfs zlib
- name: ubuntu-gcc - name: ubuntu-gcc
os: ubuntu os: ubuntu
os-version: 18.04
cxx: g++ cxx: g++
cc: gcc cc: gcc
triplet: x64-linux triplet: x64-linux
@ -50,6 +52,7 @@ jobs:
boost-filesystem boost-uuid physfs openal-soft libogg libvorbis zlib opengl boost-filesystem boost-uuid physfs openal-soft libogg libvorbis zlib opengl
- name: macos-clang - name: macos-clang
os: macos os: macos
os-version: latest
cxx: clang++ cxx: clang++
cc: clang cc: clang
triplet: x64-osx triplet: x64-osx
@ -92,7 +95,7 @@ jobs:
vcpkgArguments: ${{ matrix.packages }} vcpkgArguments: ${{ matrix.packages }}
vcpkgDirectory: ${{ runner.workspace }}/vcpkg/ vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
vcpkgTriplet: ${{ matrix.triplet }} vcpkgTriplet: ${{ matrix.triplet }}
vcpkgGitCommitId: 9a49e3df7f729655318c59b9985c9c18ad0c99d6 vcpkgGitCommitId: 5568f110b509a9fd90711978a7cb76bae75bb092
- name: Build with CMake - name: Build with CMake
uses: lukka/run-cmake@v3 uses: lukka/run-cmake@v3