aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalanto <62221668+Salanto@users.noreply.github.com>2022-12-04 19:09:27 +0000
committerGitHub <noreply@github.com>2022-12-04 20:09:27 +0100
commit59f5cccfbf0ad3dcb60fcff01e65dd6dd0eac7e5 (patch)
treee56267632ab91df9ba8b301fd383677196e588da
parente29ac843fa751f52bdbea60dd12ba692ff4ed7ee (diff)
Fix CI on master due to CVE in zlib and changed BASS folder layout (#881)
* Bump zlib version * Libbass changed the folder structure, it seems. * Should update the rest too.
-rw-r--r--.github/workflows/build.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5058abfd..2ea68556 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
cd QtApng
cd src/3rdparty
chmod +x get_libs.sh
- ./get_libs.sh 1.2.12 1.6.37
+ ./get_libs.sh 1.2.13 1.6.37
cd ../..
qmake CONFIG+=install_ok QMAKE_CXXFLAGS+="-fno-sized-deallocation" QT_PLATFORM=${{matrix.platform}}
${{steps.qt.outputs.make}} qmake_all
@@ -130,18 +130,18 @@ jobs:
run: |
curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
unzip -d bass -o bass.zip
- cp ./bass/x64/libbass.so ./lib/
- cp ./bass/x64/libbass.so ./bin/
+ cp ./bass/libs/x86_64/libbass.so ./lib/
+ cp ./bass/libs/x86_64/libbass.so ./bin/
curl http://www.un4seen.com/files/bassmidi24-linux.zip -o bassmidi.zip
unzip -d bass -o bassmidi.zip
- cp ./bass/x64/libbassmidi.so ./lib/
- cp ./bass/x64/libbassmidi.so ./bin/
+ cp ./bass/libs/x86_64/libbassmidi.so ./lib/
+ cp ./bass/libs/x86_64/libbassmidi.so ./bin/
curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
unzip -d bass -o bassopus.zip
- cp ./bass/x64/libbassopus.so ./lib/
- cp ./bass/x64/libbassopus.so ./bin/
+ cp ./bass/libs/x86_64/libbassopus.so ./lib/
+ cp ./bass/libs/x86_64/libbassopus.so ./bin/
- name: Install Mac BASS
if: matrix.os == 'macos-latest'