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

Preparations for alternate UI builds in GHA

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-01-03 23:38:53 -05:00
parent 9f8bada876
commit 7ac62e1ff8
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,7 +210,7 @@ jobs:
path: build/artifacts/** path: build/artifacts/**
linux: linux:
name: "Linux GCC 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" name: "Linux GCC 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@@ -231,6 +231,13 @@ jobs:
- name: NDR - name: NDR
new: on new: on
slug: -NDR slug: -NDR
ui:
- name: Qt GUI
qt: on
slug: -Qt
packages: >-
qtbase5-dev
qttools5-dev
steps: steps:
- name: Install dependencies - name: Install dependencies
@@ -243,10 +250,9 @@ jobs:
libpng-dev libpng-dev
libc6-dev libc6-dev
librtmidi-dev librtmidi-dev
qtbase5-dev
qttools5-dev
libopenal-dev libopenal-dev
libvncserver-dev libvncserver-dev
${{ matrix.ui.packages }}
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Configure CMake - name: Configure CMake
run: >- run: >-
@@ -260,11 +266,11 @@ jobs:
run: cmake --install build run: cmake --install build
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}' name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**
macos11: macos11:
name: "macOS 11 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)" name: "macOS 11 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
runs-on: macos-11 runs-on: macos-11
@@ -285,6 +291,12 @@ jobs:
- name: NDR - name: NDR
new: on new: on
slug: -NDR slug: -NDR
ui:
- name: Qt GUI
qt: on
slug: -Qt
packages: >-
qt@5
steps: steps:
- name: Install dependencies - name: Install dependencies
@@ -295,9 +307,9 @@ jobs:
sdl2 sdl2
libpng libpng
rtmidi rtmidi
qt@5
openal-soft openal-soft
libvncserver libvncserver
${{ matrix.ui.packages }}
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Configure CMake - name: Configure CMake
run: >- run: >-
@@ -314,5 +326,5 @@ jobs:
run: cmake --install build run: cmake --install build
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' name: '86Box-{{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**