citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #5276 from B3n30/fix_travis_frozen_linux 

fix travis-ci frozen mingw build
This commit is contained in:
Ben 2020-04-29 22:43:04 +02:00 committed by GitHub
parent c937876935 93453dddb4
commit 64694b0f11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -43,6 +43,7 @@ matrix:
dist: trusty dist: trusty
services: docker services: docker
cache: ccache cache: ccache
install: "./.travis/linux-frozen/deps.sh"
script: "./.travis/linux-frozen/build.sh" script: "./.travis/linux-frozen/build.sh"
- os: linux - os: linux
env: NAME="MinGW build" env: NAME="MinGW build"

1
.travis/linux-frozen/build.sh
View File

@ -1,4 +1,3 @@
#!/bin/bash -ex #!/bin/bash -ex
mkdir -p "$HOME/.ccache" mkdir -p "$HOME/.ccache"
docker pull citraemu/build-environments:linux-frozen
docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.travis/linux-frozen/docker.sh docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.travis/linux-frozen/docker.sh

5
.travis/linux-frozen/deps.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh -ex
sudo apt-get -y install binutils-gold
docker pull citraemu/build-environments:linux-frozen

7
.travis/linux-frozen/docker.sh
View File

@ -1,5 +1,12 @@
#!/bin/bash -ex #!/bin/bash -ex
mkdir -p ~/bin/gold
echo '#!/bin/bash' > ~/bin/gold/ld
echo 'gold "$@"' >> ~/bin/gold/ld
chmod a+x ~/bin/gold/ld
export CFLAGS="-B$HOME/bin/gold $CFLAGS"
export CXXFLAGS="-B$HOME/bin/gold $CXXFLAGS"
cd /citra cd /citra
mkdir build && cd build mkdir build && cd build