From 5bbd4400df694c32427d48874358257b1c87d0f8 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Fri, 17 Sep 2021 23:49:14 +0600 Subject: [PATCH 1/2] Add macOS and Linux targets to GitHub Actions --- .github/workflows/cmake.yml | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2b9abeaa8..edb2bd9f6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -131,3 +131,67 @@ jobs: with: name: '86Box-${{ matrix.build.name }}-VS2019-${{ matrix.target-arch }}-${{ matrix.toolset }}-${{ github.sha }}' path: build/artifacts/bin/** + + linux: + name: "Linux GCC 11" + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + build: + - name: Debug + dev-build: off + new-dynarec: off + type: Debug + - name: Dev + dev-build: on + new-dynarec: on + type: Debug + + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libopenal-dev libc6-dev + - name: Configure CMake + run: >- + cmake -S . -B build + -D CMAKE_INSTALL_PREFIX=./build/artifacts + -D DEV_BRANCH=${{ matrix.build.dev-build }} + -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} + -D VNC=OFF + -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} + - name: Build + run: cmake --build build --target install + + macos: + name: "macOS 11" + + runs-on: macos-11 + strategy: + fail-fast: false + matrix: + build: + - name: Debug + dev-build: off + new-dynarec: off + type: Debug + - name: Dev + dev-build: on + new-dynarec: on + type: Debug + + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: brew install freetype sdl2 libpng openal-soft + - name: Configure CMake + run: >- + cmake -S . -B build + -D CMAKE_INSTALL_PREFIX=./build/artifacts + -D DEV_BRANCH=${{ matrix.build.dev-build }} + -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} + -D VNC=OFF + -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} + - name: Build + run: cmake --build build --target install From b8e46772deed3cd5f4df86f5629ce1b36dc91f99 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 18 Sep 2021 00:27:07 +0600 Subject: [PATCH 2/2] Unbreak GitHub Actions --- .github/workflows/cmake.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index edb2bd9f6..f7d01baa1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -155,12 +155,12 @@ jobs: run: sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libopenal-dev libc6-dev - name: Configure CMake run: >- - cmake -S . -B build - -D CMAKE_INSTALL_PREFIX=./build/artifacts - -D DEV_BRANCH=${{ matrix.build.dev-build }} - -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} - -D VNC=OFF - -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} + cmake -S . -B build + -D CMAKE_INSTALL_PREFIX=./build/artifacts + -D DEV_BRANCH=${{ matrix.build.dev-build }} + -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} + -D VNC=OFF + -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} - name: Build run: cmake --build build --target install @@ -187,11 +187,11 @@ jobs: run: brew install freetype sdl2 libpng openal-soft - name: Configure CMake run: >- - cmake -S . -B build - -D CMAKE_INSTALL_PREFIX=./build/artifacts - -D DEV_BRANCH=${{ matrix.build.dev-build }} - -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} - -D VNC=OFF - -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} + cmake -S . -B build + -D CMAKE_INSTALL_PREFIX=./build/artifacts + -D DEV_BRANCH=${{ matrix.build.dev-build }} + -D NEW_DYNAREC=${{ matrix.build.new-dynarec }} + -D VNC=OFF + -D CMAKE_BUILD_TYPE=${{ matrix.build.type }} - name: Build run: cmake --build build --target install