github: Add windows build, remove appveyor
This commit is contained in:
parent
4fa646bae5
commit
8b1859d5ca
3 changed files with 17 additions and 35 deletions
|
@ -1,32 +0,0 @@
|
||||||
# shallow clone
|
|
||||||
clone_depth: 5
|
|
||||||
|
|
||||||
environment:
|
|
||||||
matrix:
|
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
|
||||||
cmake_generator: "Visual Studio 15 2017 Win64"
|
|
||||||
|
|
||||||
platform:
|
|
||||||
- x64
|
|
||||||
|
|
||||||
configuration:
|
|
||||||
- Release
|
|
||||||
|
|
||||||
install:
|
|
||||||
- git submodule update --init --recursive
|
|
||||||
- cd externals
|
|
||||||
- git clone https://github.com/MerryMage/ext-boost boost
|
|
||||||
- cd ..
|
|
||||||
|
|
||||||
before_build:
|
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- cmake .. -G "%cmake_generator%" -DBoost_INCLUDE_DIRS=%cd%/../externals/boost
|
|
||||||
- cd ..
|
|
||||||
|
|
||||||
build:
|
|
||||||
project: build/dynarmic.sln
|
|
||||||
parallel: true
|
|
||||||
|
|
||||||
test_script:
|
|
||||||
- cd build && ctest -VV -C Release && cd ..
|
|
18
.github/workflows/build-and-test.yml
vendored
18
.github/workflows/build-and-test.yml
vendored
|
@ -9,7 +9,7 @@ jobs:
|
||||||
build:
|
build:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest]
|
os: [windows-latest, ubuntu-latest, macos-latest]
|
||||||
cpu_detection: [0, 1]
|
cpu_detection: [0, 1]
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
|
||||||
|
@ -37,16 +37,19 @@ jobs:
|
||||||
path: externals/ext-boost
|
path: externals/ext-boost
|
||||||
|
|
||||||
- name: Checkout unicorn repo
|
- name: Checkout unicorn repo
|
||||||
|
if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
repository: MerryMage/unicorn
|
repository: MerryMage/unicorn
|
||||||
path: externals/unicorn
|
path: externals/unicorn
|
||||||
|
|
||||||
- name: Build unicorn
|
- name: Build unicorn
|
||||||
|
if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
|
||||||
working-directory: externals/unicorn
|
working-directory: externals/unicorn
|
||||||
run: UNICORN_ARCHS=aarch64,arm ./make.sh
|
run: UNICORN_ARCHS=aarch64,arm ./make.sh
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
|
if: ${{matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'}}
|
||||||
run: >
|
run: >
|
||||||
cmake
|
cmake
|
||||||
-B ${{github.workspace}}/build
|
-B ${{github.workspace}}/build
|
||||||
|
@ -59,9 +62,20 @@ jobs:
|
||||||
-DLIBUNICORN_LIBRARY=${{github.workspace}}/externals/unicorn/libunicorn.a
|
-DLIBUNICORN_LIBRARY=${{github.workspace}}/externals/unicorn/libunicorn.a
|
||||||
-G Ninja
|
-G Ninja
|
||||||
|
|
||||||
|
- name: Configure CMake
|
||||||
|
if: ${{matrix.os == 'windows-latest'}}
|
||||||
|
run: >
|
||||||
|
cmake
|
||||||
|
-B ${{github.workspace}}/build
|
||||||
|
-DBoost_INCLUDE_DIRS=${{github.workspace}}/externals/ext-boost
|
||||||
|
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
|
||||||
|
-DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=${{matrix.cpu_detection}}
|
||||||
|
-G "Visual Studio 16 2019"
|
||||||
|
-A x64
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
working-directory: ${{github.workspace}}/build
|
working-directory: ${{github.workspace}}/build
|
||||||
run: ninja
|
run: cmake --build . --config Release
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Dynarmic
|
Dynarmic
|
||||||
========
|
========
|
||||||
|
|
||||||
[![Github Actions Build Status](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml) [![Appveyor CI Build status](https://ci.appveyor.com/api/projects/status/maeiqr41rgm1innm/branch/master?svg=true)](https://ci.appveyor.com/project/MerryMage/dynarmic/branch/master)
|
[![Github Actions Build Status](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/MerryMage/dynarmic/actions/workflows/build-and-test.yml)
|
||||||
|
|
||||||
A dynamic recompiler for ARM.
|
A dynamic recompiler for ARM.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue