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

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
altiereslima
2021-11-14 21:45:10 -03:00
committed by GitHub
parent 441ac9171d a45d8ac3ae
commit 02575e028c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/build.sh
View File

@@ -145,7 +145,7 @@ build() {
echo [-] Switching to MSYSTEM [$msys]
cd "$cwd"
CHERE_INVOKING=yes MSYSTEM="$msys" JOB_BASE_NAME="$JOB_BASE_NAME" BUILD_TYPE="$BUILD_TYPE" BUILD_NUMBER="$BUILD_NUMBER" GIT_COMMIT="$GIT_COMMIT" \
bash -lc 'exec "'$0'" -b "'$arch'" '$cmake_flags && job_status=0 # make sure the main script exits cleanly on any success
bash -lc 'exec "'$0'" -b "'$arch'" '"$cmake_flags" && job_status=0 # make sure the main script exits cleanly on any success
return $?
fi
else
@@ -354,7 +354,7 @@ EOF
:
else
# Create binary tarball.
make_tar ../$job_name-Linux-$arch$build_fn.tar
VERBOSE=1 make_tar ../$job_name-Linux-$arch$build_fn.tar
local status=$?
fi
cd ..

13
.github/workflows/c-cpp.yml vendored
View File

@@ -1,4 +1,4 @@
name: C/C++ CI
name: MinGW64 Makefile
on:
@@ -16,7 +16,7 @@ on:
jobs:
build:
name: ${{ matrix.environment.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }}, CLANG=${{ matrix.clang }})
name: ${{ matrix.environment.msystem }} Makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
runs-on: windows-latest
@@ -25,11 +25,10 @@ jobs:
shell: msys2 {0}
strategy:
fail-fast: false
fail-fast: true
matrix:
dev-build: ['y', 'n']
new-dynarec: ['y', 'n']
clang: ['y', 'n']
environment:
- msystem: MINGW32
prefix: mingw-w64-i686
@@ -37,9 +36,6 @@ jobs:
- msystem: MINGW64
prefix: mingw-w64-x86_64
x64: y
- msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64
x64: y
steps:
- uses: msys2/setup-msys2@v2
@@ -49,7 +45,6 @@ jobs:
install: >-
make
${{ matrix.environment.prefix }}-gcc
${{ matrix.environment.prefix }}-clang
${{ matrix.environment.prefix }}-pkg-config
${{ matrix.environment.prefix }}-openal
${{ matrix.environment.prefix }}-freetype
@@ -60,5 +55,5 @@ jobs:
${{ matrix.environment.prefix }}-winpthreads
- uses: actions/checkout@v2
- name: make
run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} CLANG=${{ matrix.clang }} VNC=n
run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} VNC=n
working-directory: ./src