80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

workflows: use the new presets

Browse Source
This commit is contained in:
David Hrdlička 2021-08-29 15:36:47 +02:00
parent edce4dca18
commit 48e9165b13
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.github/workflows/cmake.yml vendored
View File

@ -6,6 +6,7 @@ on:
paths: paths:
- src/** - src/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json"
- .github/workflows/cmake.yml - .github/workflows/cmake.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@ -14,6 +15,7 @@ on:
paths: paths:
- src/** - src/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/cmake.yml - .github/workflows/cmake.yml
- vcpkg.json - vcpkg.json
@ -21,7 +23,7 @@ on:
jobs: jobs:
mingw: mingw:
name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.target-arch.msystem }}) name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }})
runs-on: windows-latest runs-on: windows-latest
@ -33,15 +35,13 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
build: build:
- name: Regular
preset: regular
- name: Debug - name: Debug
dev-build: off preset: debug
new-dynarec: off
type: Debug
- name: Dev - name: Dev
dev-build: on preset: experimental
new-dynarec: on environment:
type: Debug
target-arch:
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
- msystem: MINGW64 - msystem: MINGW64
@ -56,30 +56,28 @@ jobs:
with: with:
path-type: inherit path-type: inherit
update: true update: true
msystem: ${{ matrix.target-arch.msystem }} msystem: ${{ matrix.environment.msystem }}
install: >- install: >-
${{ matrix.target-arch.prefix }}-toolchain ${{ matrix.environment.prefix }}-ninja
${{ matrix.target-arch.prefix }}-openal ${{ matrix.environment.prefix }}-toolchain
${{ matrix.target-arch.prefix }}-freetype ${{ matrix.environment.prefix }}-openal
${{ matrix.target-arch.prefix }}-SDL2 ${{ matrix.environment.prefix }}-freetype
${{ matrix.target-arch.prefix }}-zlib ${{ matrix.environment.prefix }}-SDL2
${{ matrix.target-arch.prefix }}-libpng ${{ matrix.environment.prefix }}-zlib
${{ matrix.target-arch.prefix }}-libvncserver ${{ matrix.environment.prefix }}-libpng
${{ matrix.environment.prefix }}-libvncserver
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -S . -B build
-G "MSYS Makefiles" --preset ${{ matrix.build.preset }}
-D CMAKE_INSTALL_PREFIX=./build/artifacts -D CMAKE_INSTALL_PREFIX=./build/artifacts
-D CMAKE_BUILD_TYPE=${{ env.build.type }}
-D DEV_BRANCH=${{ matrix.build.dev-build }}
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D VNC=OFF -D VNC=OFF
- name: Build - name: Build
run: cmake --build build --target install run: cmake --build build --target install
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box-MSYS2-${{ matrix.target-arch.msystem }}-${{ matrix.build.name }}-${{ github.sha }}' name: '86Box-${{ matrix.build.name }}-MSYS2-${{ matrix.environment.msystem }}-${{ github.sha }}'
path: build/artifacts/bin/** path: build/artifacts/bin/**
vs2019: vs2019:
@ -125,5 +123,5 @@ jobs:
run: cmake --build build --config ${{ matrix.build.type }} --target install run: cmake --build build --config ${{ matrix.build.type }} --target install
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box-VS2019-${{ matrix.build.name }}-${{ matrix.target-arch }}-${{ matrix.toolset }}-${{ github.sha }}' name: '86Box-${{ matrix.build.name }}-VS2019-${{ matrix.target-arch }}-${{ matrix.toolset }}-${{ github.sha }}'
path: build/artifacts/bin/** path: build/artifacts/bin/**