Skip to content

Commit 886ac8c

Browse files
committed
Merge branch 'master' of https://github.com/ManimCommunity/manim into pango-text
2 parents 17b018e + dc4504c commit 886ac8c

File tree

10 files changed

+970
-239
lines changed

10 files changed

+970
-239
lines changed

.github/manimdependency.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
"pango": "v0.1.0"
66
}
77
}

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ jobs:
8181
run: |
8282
$soxVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'])"
8383
$soxVersionNumber = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'].split('-')[1])"
84-
$ffmpegVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'])"
85-
$ffmpegVersionNumber = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'].split('-')[1])"
86-
$pangoVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['pango'])"
84+
$ffmpegUrl = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'])"
8785
$OriPath = $env:PATH
8886
echo "Install Tinytex"
8987
Invoke-WebRequest "https://ci.appveyor.com/api/projects/yihui/tinytex/artifacts/TinyTeX.zip?job=image:%20Visual%20Studio%202019" -O "$($env:TMP)\TinyTex.zip"
@@ -95,8 +93,8 @@ jobs:
9593
Invoke-WebRequest "https://downloads.sourceforge.net/project/sox/sox/$($soxVersionNumber)/$($soxVersion).zip" -UserAgent "wget" -O "$($env:TMP)\SoX.zip"
9694
7z x "$($env:TMP)\SoX.zip" -o"$($PWD)\ManimCache"
9795
Move-Item "ManimCache\sox-*" "ManimCache\SoX"
98-
Invoke-WebRequest "https://ffmpeg.zeranoe.com/builds/win64/static/$($ffmpegVersion).zip" -O "$($env:TMP)\$($ffmpegVersion).zip"
99-
7z x "$($env:TMP)\$($ffmpegVersion).zip" -o"$($PWD)\ManimCache"
96+
Invoke-WebRequest "$ffmpegUrl" -O "$($env:TMP)\ffmpeg.zip"
97+
7z x "$($env:TMP)\ffmpeg.zip" -o"$($PWD)\ManimCache"
10098
Move-Item "ManimCache\ffmpeg-*" "ManimCache\FFmpeg"
10199
Invoke-WebRequest "https://github.com/naveen521kk/manim-windows/releases/download/$($pangoVersion)/pango-windows-binaires-x64.zip" -O "$($env:TMP)\Pango.zip"
102100
7z x "$($env:TMP)\$($Pango).zip" -o"$($PWD)\ManimCache\Pango"

0 commit comments

Comments
 (0)