From ae996464b20926b2ac2f45d3cc4aef36dc1d02ba Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 29 Jan 2022 22:13:37 -0500 Subject: [PATCH] More Consistency for github actions builds --- .github/workflows/cmake.yml | 94 ++++++++++++++++++++++++++++++++----- CMakePresets.json | 48 +++++++++++++++++++ 2 files changed, 130 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ea4ab4c4f..120185c0f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -22,7 +22,7 @@ on: - "!**/Makefile*" jobs: - mingw: + msys2: name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }}) runs-on: windows-latest @@ -35,15 +35,30 @@ jobs: fail-fast: false matrix: build: - - name: Regular + - name: Regular ODR + slug: -ODR preset: regular target: install/strip - - name: Debug + - name: Debug ODR + slug: -ODR-Debug preset: debug target: install - - name: Dev + - name: Dev ODR + slug: -ODR-Dev preset: experimental target: install + - name: Regular NDR + slug: -NDR + preset: regularndr + target: install/strip + - name: Debug NDR + slug: -NDR-Debug + preset: debugndr + target: install + - name: Dev NDR + slug: -NDR-Dev + preset: experimentalndr + target: install environment: - msystem: MINGW32 prefix: mingw-w64-i686 @@ -51,6 +66,8 @@ jobs: prefix: mingw-w64-x86_64 - msystem: UCRT64 prefix: mingw-w64-ucrt-x86_64 +# - msystem: CLANG32 +# prefix: mingw-w64-clang-i686 - msystem: CLANG64 prefix: mingw-w64-clang-x86_64 @@ -99,21 +116,36 @@ jobs: matrix: build: - name: Regular ODR + slug: -ODR type: Release + dev-build: off new-dynarec: off strip: --strip - name: Debug ODR - slug: -Debug + slug: -ODR-Debug type: Debug + dev-build: off + new-dynarec: off + - name: Dev ODR + slug: -ODR-Dev + type: Debug + dev-build: on new-dynarec: off - name: Regular NDR slug: -NDR type: Release strip: --strip + dev-build: off new-dynarec: on - name: Debug NDR slug: -NDR-Debug type: Debug + dev-build: off + new-dynarec: on + - name: Dev NDR + slug: -NDR-Dev + type: Debug + dev-build: on new-dynarec: on target: - name: x86 @@ -185,16 +217,38 @@ jobs: fail-fast: false matrix: build: - - name: Debug - slug: -Debug + - name: Regular ODR + slug: -ODR + type: Release dev-build: off new-dynarec: off + strip: --strip + - name: Debug ODR + slug: -ODR-Debug + type: Debug + dev-build: off + new-dynarec: off + - name: Dev ODR + slug: -ODR-Dev + type: Debug + dev-build: on + new-dynarec: off + - name: Regular NDR + slug: -NDR + type: Release + strip: --strip + dev-build: off + new-dynarec: on + - name: Debug NDR + slug: -NDR-Debug + type: Debug + dev-build: off + new-dynarec: on + - name: Dev NDR + slug: -NDR-Dev type: Debug - - name: Dev - slug: -Dev dev-build: on new-dynarec: on - type: Debug steps: - uses: actions/checkout@v2 @@ -218,30 +272,46 @@ jobs: name: '86Box${{ matrix.build.slug }}-Linux-x86_64-gha${{ github.run_number }}' path: build/artifacts/** - macos: + macos11: name: "macOS 11 (${{ matrix.build.name }} x86_64)" runs-on: macos-11 + strategy: fail-fast: false matrix: build: - name: Regular ODR + slug: -ODR type: Release + dev-build: off new-dynarec: off strip: --strip - name: Debug ODR - slug: -Debug + slug: -ODR-Debug type: Debug + dev-build: off + new-dynarec: off + - name: Dev ODR + slug: -ODR-Dev + type: Debug + dev-build: on new-dynarec: off - name: Regular NDR slug: -NDR type: Release strip: --strip + dev-build: off new-dynarec: on - name: Debug NDR slug: -NDR-Debug type: Debug + dev-build: off + new-dynarec: on + - name: Dev NDR + slug: -NDR-Dev + type: Debug + dev-build: on new-dynarec: on steps: diff --git a/CMakePresets.json b/CMakePresets.json index 2cfd8ea4a..8ff0e502c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -34,6 +34,18 @@ "NEW_DYNAREC": "OFF" } }, + { + "name": "regularndr", + "inherits": [ + "flags-base" + ], + "generator": "Ninja", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "DEV_BRANCH": "OFF", + "NEW_DYNAREC": "ON" + } + }, { "name": "optimized", "inherits": [ @@ -46,6 +58,18 @@ "NEW_DYNAREC": "OFF" } }, + { + "name": "optimizedndr", + "inherits": [ + "flags-base" + ], + "generator": "Ninja", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Optimized", + "DEV_BRANCH": "OFF", + "NEW_DYNAREC": "ON" + } + }, { "name": "debug", "inherits": [ @@ -58,12 +82,36 @@ "NEW_DYNAREC": "OFF" } }, + { + "name": "debugndr", + "inherits": [ + "flags-base" + ], + "generator": "Ninja", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "DEV_BRANCH": "OFF", + "NEW_DYNAREC": "ON" + } + }, { "name": "experimental", "inherits": [ "flags-base" ], "generator": "Ninja", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "DEV_BRANCH": "ON", + "NEW_DYNAREC": "OFF" + } + }, + { + "name": "experimentalndr", + "inherits": [ + "flags-base" + ], + "generator": "Ninja", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "DEV_BRANCH": "ON",