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

Fix git merge command

This commit is contained in:
Tim Allen 2017-10-08 17:29:14 +11:00
parent 0db886f91d
commit 7a4bfca106
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -41,7 +41,7 @@ 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 libretro - 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/