Skip to content

Commit 2d63995

Browse files
author
Hugues Devimeux
committed
Merge branch 'master' into fix-472
2 parents 0cc008f + 037c9be commit 2d63995

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1464
-471
lines changed

.github/manimdependency.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"windows": {
33
"sox": "sox-14.4.2-win32",
4-
"ffmpeg": "ffmpeg-4.3.1-win64-static"
4+
"ffmpeg": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-2020-09-16-full_build.zip"
55
}
66
}

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ jobs:
7777
run: |
7878
$soxVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'])"
7979
$soxVersionNumber = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'].split('-')[1])"
80-
$ffmpegVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'])"
81-
$ffmpegVersionNumber = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'].split('-')[1])"
80+
$ffmpegUrl = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'])"
8281
$OriPath = $env:PATH
8382
echo "Install Tinytex"
8483
Invoke-WebRequest "https://ci.appveyor.com/api/projects/yihui/tinytex/artifacts/TinyTeX.zip?job=image:%20Visual%20Studio%202019" -O "$($env:TMP)\TinyTex.zip"
@@ -90,8 +89,8 @@ jobs:
9089
Invoke-WebRequest "https://downloads.sourceforge.net/project/sox/sox/$($soxVersionNumber)/$($soxVersion).zip" -UserAgent "wget" -O "$($env:TMP)\SoX.zip"
9190
7z x "$($env:TMP)\SoX.zip" -o"$($PWD)\ManimCache"
9291
Move-Item "ManimCache\sox-*" "ManimCache\SoX"
93-
Invoke-WebRequest "https://ffmpeg.zeranoe.com/builds/win64/static/$($ffmpegVersion).zip" -O "$($env:TMP)\$($ffmpegVersion).zip"
94-
7z x "$($env:TMP)\$($ffmpegVersion).zip" -o"$($PWD)\ManimCache"
92+
Invoke-WebRequest "$ffmpegUrl" -O "$($env:TMP)\ffmpeg.zip"
93+
7z x "$($env:TMP)\ffmpeg.zip" -o"$($PWD)\ManimCache"
9594
Move-Item "ManimCache\ffmpeg-*" "ManimCache\FFmpeg"
9695
9796
- name: Add Windows dependecies to path

0 commit comments

Comments
 (0)