Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2024-10-27 20:34:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #318 from rorpage/fix-ffmpeg-choco-build-issue

Browse Source 
Update travis.yml to use specific version of ffmpeg
This commit is contained in:
tobspr 2020-06-27 08:55:46 +02:00 committed by GitHub
commit c2d64fdf5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -111,7 +111,7 @@ jobs:
env: YARN_GPG=no env: YARN_GPG=no
before_install: before_install:
- choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed - choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
- choco install ffmpeg - choco install ffmpeg --version=4.2.3
- export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH - export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/ - wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/msvfw32.dll -P /C/Windows/System32/ - wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/msvfw32.dll -P /C/Windows/System32/
@ -129,7 +129,7 @@ jobs:
env: YARN_GPG=no env: YARN_GPG=no
before_install: before_install:
- choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed - choco install git-lfs -y -f || echo "0" # choco fails but git-lfs is still installed
- choco install ffmpeg - choco install ffmpeg --version=4.2.3
- choco install wget - choco install wget
- export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH - export PATH=/C/ProgramData/chocolatey/lib/ffmpeg/tools/ffmpeg/bin:$PATH
- wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/ - wget https://github.com/moiamond/docker-ffmpeg-base-windowsservercore/raw/master/System32/avicap32.dll -P /C/Windows/System32/