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

Adjust the artifact names

Browse Source
This commit is contained in:
David Hrdlička 2022-01-29 02:14:43 +01:00
parent 2f732e8d4b
commit 96eb10f77c
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,11 +83,11 @@ jobs:
run: cmake --build build --target ${{ matrix.build.target }} run: cmake --build build --target ${{ matrix.build.target }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box-${{ matrix.build.name }}-MSYS2-${{ matrix.environment.msystem }}-${{ github.sha }}' name: '86Box-${{ matrix.build.name }}-MSYS2-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**
llvm-windows: llvm-windows:
name: "Windows vcpkg/LLVM (${{ matrix.build }} ${{ matrix.target.name }} NDR=${{ matrix.new-dynarec }})" name: "Windows vcpkg/LLVM (${{ matrix.build.name }} ${{ matrix.target.name }})"
runs-on: windows-2022 runs-on: windows-2022
@ -97,8 +97,23 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
build: [Release, Debug] build:
new-dynarec: [on, off] - name: Regular ODR
slug: ''
type: Release
new-dynarec: off
- name: Debug ODR
slug: -Debug
type: Debug
new-dynarec: off
- name: Regular NDR
slug: -NDR
type: Release
new-dynarec: on
- name: Debug NDR
slug: -NDR-Debug
type: Debug
new-dynarec: on
target: target:
- name: x86 - name: x86
triplet: x86-windows-static triplet: x86-windows-static
@ -116,7 +131,8 @@ jobs:
- build: Release - build: Release
strip: --strip strip: --strip
exclude: exclude:
- new-dynarec: off - build:
new-dynarec: off
target: target:
name: ARM64 name: ARM64
@ -144,8 +160,8 @@ jobs:
set PATH=C:/Program Files/LLVM/bin;%PATH% set PATH=C:/Program Files/LLVM/bin;%PATH%
cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=${{ matrix.build }} cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=${{ matrix.build.type }}
-D NEW_DYNAREC=${{ matrix.new-dynarec }} -D NEW_DYNAREC=${{ matrix.build.new-dynarec }}
-D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }} -D VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ github.workspace }}/${{ matrix.target.toolchain }}
-D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }} -D VCPKG_TARGET_TRIPLET=${{ matrix.target.triplet }}
@ -159,7 +175,7 @@ jobs:
run: cmake --install build --prefix ./build/artifacts ${{ matrix.strip }} run: cmake --install build --prefix ./build/artifacts ${{ matrix.strip }}
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: '86Box-${{ matrix.build }}-NDR${{ matrix.new-dynarec }}-Win32-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}' name: '86Box${{ matrix.build.slug }}-Windows-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**
linux: linux: