workflows: adjust the vs2019 job
- reduce the number of builds - more descriptive names for artifacts and builds - populate the package manually instead of using CPack, which results in double ZIPs being generated
This commit is contained in:
parent
e4c0319d27
commit
8e0a3187a5
33
.github/workflows/cmake.yml
vendored
33
.github/workflows/cmake.yml
vendored
@ -66,22 +66,31 @@ jobs:
|
||||
run: cmake --build build
|
||||
|
||||
vs2019:
|
||||
name: VS2019 ${{ matrix.toolset }} ${{ matrix.target-arch }} build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
|
||||
name: VS2019 ${{ matrix.build.name }} ${{ matrix.target-arch }} build (${{ matrix.toolset }})
|
||||
|
||||
runs-on: windows-latest
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
dev-build: ['ON', 'OFF']
|
||||
new-dynarec: ['ON', 'OFF']
|
||||
build:
|
||||
- name: Regular
|
||||
dev-build: off
|
||||
new-dynarec: off
|
||||
type: Debug
|
||||
- name: Dev
|
||||
dev-build: on
|
||||
new-dynarec: on
|
||||
type: Debug
|
||||
target-arch: ['Win32', 'x64', 'ARM', 'ARM64']
|
||||
toolset: ['clangcl', 'v142']
|
||||
exclude:
|
||||
- target-arch: 'ARM'
|
||||
new-dynarec: 'OFF'
|
||||
build:
|
||||
new-dynarec: off
|
||||
- target-arch: 'ARM64'
|
||||
new-dynarec: 'OFF'
|
||||
build:
|
||||
new-dynarec: off
|
||||
- target-arch: 'ARM'
|
||||
toolset: 'clangcl'
|
||||
|
||||
@ -96,15 +105,13 @@ jobs:
|
||||
cmake -S . -B build
|
||||
-G "Visual Studio 16 2019" -A ${{ matrix.target-arch }} -T ${{ matrix.toolset }}
|
||||
-D CMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake
|
||||
-D CPACK_GENERATOR=ZIP
|
||||
-D DEV_BRANCH=${{ matrix.dev-build }}
|
||||
-D NEW_DYNAREC=${{ matrix.new-dynarec }}
|
||||
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/artifacts
|
||||
-D DEV_BRANCH=${{ matrix.build.dev-build }}
|
||||
-D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
|
||||
-D VNC=OFF
|
||||
- name: Build
|
||||
run: cmake --build build --config ${{ env.BUILD_TYPE }}
|
||||
- name: Package
|
||||
run: cmake --build build --config ${{ env.BUILD_TYPE }} --target package
|
||||
run: cmake --build build --config ${{ matrix.build.type }} --target install
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: '86Box-VS2019-${{ matrix.toolset }}-${{ matrix.target-arch}}-${{ matrix.dev-build }}-${{ matrix.new-dynarec }}-${{ github.run_number }}'
|
||||
path: build/*.zip
|
||||
name: '86Box-VS2019-${{ matrix.build.name }}-${{ matrix.target-arch }}-${{ matrix.toolset }}-${{ github.sha }}'
|
||||
path: build/artifacts/bin/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user