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

More Consistency for github actions builds

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-29 22:13:37 -05:00
parent a0c90097e4
commit ae996464b2
2 changed files with 130 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ on:
- "!**/Makefile*" - "!**/Makefile*"
jobs: jobs:
mingw: msys2:
name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }}) name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }})
runs-on: windows-latest runs-on: windows-latest
@@ -35,15 +35,30 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
build: build:
- name: Regular - name: Regular ODR
slug: -ODR
preset: regular preset: regular
target: install/strip target: install/strip
- name: Debug - name: Debug ODR
slug: -ODR-Debug
preset: debug preset: debug
target: install target: install
- name: Dev - name: Dev ODR
slug: -ODR-Dev
preset: experimental preset: experimental
target: install 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: environment:
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
@@ -51,6 +66,8 @@ jobs:
prefix: mingw-w64-x86_64 prefix: mingw-w64-x86_64
- msystem: UCRT64 - msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64 prefix: mingw-w64-ucrt-x86_64
# - msystem: CLANG32
# prefix: mingw-w64-clang-i686
- msystem: CLANG64 - msystem: CLANG64
prefix: mingw-w64-clang-x86_64 prefix: mingw-w64-clang-x86_64
@@ -99,21 +116,36 @@ jobs:
matrix: matrix:
build: build:
- name: Regular ODR - name: Regular ODR
slug: -ODR
type: Release type: Release
dev-build: off
new-dynarec: off new-dynarec: off
strip: --strip strip: --strip
- name: Debug ODR - name: Debug ODR
slug: -Debug slug: -ODR-Debug
type: Debug type: Debug
dev-build: off
new-dynarec: off
- name: Dev ODR
slug: -ODR-Dev
type: Debug
dev-build: on
new-dynarec: off new-dynarec: off
- name: Regular NDR - name: Regular NDR
slug: -NDR slug: -NDR
type: Release type: Release
strip: --strip strip: --strip
dev-build: off
new-dynarec: on new-dynarec: on
- name: Debug NDR - name: Debug NDR
slug: -NDR-Debug slug: -NDR-Debug
type: Debug type: Debug
dev-build: off
new-dynarec: on
- name: Dev NDR
slug: -NDR-Dev
type: Debug
dev-build: on
new-dynarec: on new-dynarec: on
target: target:
- name: x86 - name: x86
@@ -185,16 +217,38 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
build: build:
- name: Debug - name: Regular ODR
slug: -Debug slug: -ODR
type: Release
dev-build: off dev-build: off
new-dynarec: 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 type: Debug
- name: Dev
slug: -Dev
dev-build: on dev-build: on
new-dynarec: on new-dynarec: on
type: Debug
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -218,30 +272,46 @@ jobs:
name: '86Box${{ matrix.build.slug }}-Linux-x86_64-gha${{ github.run_number }}' name: '86Box${{ matrix.build.slug }}-Linux-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**
macos: macos11:
name: "macOS 11 (${{ matrix.build.name }} x86_64)" name: "macOS 11 (${{ matrix.build.name }} x86_64)"
runs-on: macos-11 runs-on: macos-11
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
build: build:
- name: Regular ODR - name: Regular ODR
slug: -ODR
type: Release type: Release
dev-build: off
new-dynarec: off new-dynarec: off
strip: --strip strip: --strip
- name: Debug ODR - name: Debug ODR
slug: -Debug slug: -ODR-Debug
type: Debug type: Debug
dev-build: off
new-dynarec: off
- name: Dev ODR
slug: -ODR-Dev
type: Debug
dev-build: on
new-dynarec: off new-dynarec: off
- name: Regular NDR - name: Regular NDR
slug: -NDR slug: -NDR
type: Release type: Release
strip: --strip strip: --strip
dev-build: off
new-dynarec: on new-dynarec: on
- name: Debug NDR - name: Debug NDR
slug: -NDR-Debug slug: -NDR-Debug
type: Debug type: Debug
dev-build: off
new-dynarec: on
- name: Dev NDR
slug: -NDR-Dev
type: Debug
dev-build: on
new-dynarec: on new-dynarec: on
steps: steps:

48
CMakePresets.json
View File

@@ -34,6 +34,18 @@
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "regularndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "optimized", "name": "optimized",
"inherits": [ "inherits": [
@@ -46,6 +58,18 @@
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "optimizedndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Optimized",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "debug", "name": "debug",
"inherits": [ "inherits": [
@@ -58,12 +82,36 @@
"NEW_DYNAREC": "OFF" "NEW_DYNAREC": "OFF"
} }
}, },
{
"name": "debugndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "OFF",
"NEW_DYNAREC": "ON"
}
},
{ {
"name": "experimental", "name": "experimental",
"inherits": [ "inherits": [
"flags-base" "flags-base"
], ],
"generator": "Ninja", "generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "ON",
"NEW_DYNAREC": "OFF"
}
},
{
"name": "experimentalndr",
"inherits": [
"flags-base"
],
"generator": "Ninja",
"cacheVariables": { "cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug", "CMAKE_BUILD_TYPE": "Debug",
"DEV_BRANCH": "ON", "DEV_BRANCH": "ON",