ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using "--no-commit" didn't work, let's try something else.

This commit is contained in:
Tim Allen 2017-10-08 18:17:48 +11:00
parent 3507c522f4
commit 18afd41a80
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -41,7 +41,9 @@ windows-x86_64-binaries:
libretro-test: libretro-test:
script: script:
- apt-get update && apt-get -y install build-essential git - apt-get update && apt-get -y install build-essential git
- git merge --no-commit origin/libretro # git refuses to even attempt a merge if you haven't told it who you are,
# even if you use --no-commit. *sigh*
- EMAIL=fake-email@example.com git merge origin/libretro
- make -C higan compiler=g++ binary=library target=libretro - make -C higan compiler=g++ binary=library target=libretro
- mkdir libretro-nightly - mkdir libretro-nightly
- cp -a higan/out/higan/out/higan_sfc_libretro.so higan-nightly/ - cp -a higan/out/higan/out/higan_sfc_libretro.so higan-nightly/