Skip to content

Commit f230d35

Browse files
committed
Revert "CI Win: use pre-built Spout"
This reverts commit b300fa6. we would need to patch the upstream Spout code
1 parent 485851f commit f230d35

2 files changed

Lines changed: 25 additions & 11 deletions

File tree

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
#!/bin/sh -eux
22
# Install SPOUT
33

4+
build() {(
5+
cd /c
6+
rm -rf Spout2
7+
git clone --depth 1 https://github.com/leadedge/Spout2.git
8+
cd Spout2
9+
/c/Program\ Files/CMake/bin/cmake.exe -Bbuild2 . # ./BUILD already exists
10+
/c/Program\ Files/CMake/bin/cmake.exe --build build2 --config Release \
11+
-j "$(nproc)"
12+
)}
13+
414
install() {(
5-
# .github/scripts/download-gh-asset.sh leadedge/Spout2 binaries Spout.zip
6-
curl -LSs https://github.com/leadedge/Spout2/releases/download/\
7-
2.007.016/Spout-SDK-binaries_2-007-016.zip -o Spout.zip
8-
unzip Spout.zip
9-
# d=$(echo Spout-SDK-binaries/Libs_*)
10-
d=$(echo Spout-SDK-binaries/*/Libs)
11-
cp "$d"/MT/bin/SpoutLibrary.dll /usr/local/bin/
12-
cp "$d"/MT/lib/SpoutLibrary.lib /usr/local/lib/
13-
cp "$d"/include/SpoutLibrary/SpoutLibrary.h /usr/local/include/
15+
mkdir -p /usr/local/bin /usr/local/include /usr/local/lib
16+
cp /c/Spout2/build2/bin/Release/SpoutLibrary.dll /usr/local/bin/
17+
cp /c/Spout2/build2/lib/Release/SpoutLibrary.lib /usr/local/lib/
18+
cp /c/Spout2/SPOUTSDK/SpoutLibrary/SpoutLibrary.h /usr/local/include/
1419
)}
1520

16-
install
21+
$1

.github/workflows/ccpp.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,17 @@ jobs:
311311
- name: bootsrap MSYS2
312312
run: $GITHUB_WORKSPACE/.github/scripts/Windows/prepare_msys.sh
313313

314+
- name: Run actions/cache for Spout build
315+
id: cache-spout
316+
uses: actions/cache@main
317+
with:
318+
path: 'C:\Spout2'
319+
key: cache-spout-${{ runner.os }}-${{ hashFiles('.github/scripts/Windows/install_spout.sh') }}
320+
- name: Build Spout
321+
if: steps.cache-spout.outputs.cache-hit != 'true'
322+
run: $GITHUB_WORKSPACE/.github/scripts/Windows/install_spout.sh build
314323
- name: Install Spout
315-
run: $GITHUB_WORKSPACE/.github/scripts/Windows/install_spout.sh
324+
run: $GITHUB_WORKSPACE/.github/scripts/Windows/install_spout.sh install
316325

317326
- name: Run actions/cache for CineForm build
318327
id: cache-cineform

0 commit comments

Comments
 (0)