Merge pull request #568 from manongjohn/master
Fix macOS Github Action build issue
This commit is contained in:
commit
f41c78b179
3 changed files with 26 additions and 22 deletions
|
@ -1,4 +1,4 @@
|
||||||
name: Tahoma2D Build
|
name: Tahoma2D Linux Build
|
||||||
|
|
||||||
on: [push, pull_request]
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
@ -28,22 +28,3 @@ jobs:
|
||||||
with:
|
with:
|
||||||
name: Tahoma2D-linux.tar.gz
|
name: Tahoma2D-linux.tar.gz
|
||||||
path: toonz/build/Tahoma2D-linux.tar.gz
|
path: toonz/build/Tahoma2D-linux.tar.gz
|
||||||
|
|
||||||
macOS:
|
|
||||||
runs-on: macos-10.15
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Install Dependencies
|
|
||||||
run: bash ./ci-scripts/osx/tahoma-install.sh
|
|
||||||
- name: Build ffmpeg
|
|
||||||
run: bash ./ci-scripts/osx/tahoma-buildffmpeg.sh
|
|
||||||
- name: Build OpenCV
|
|
||||||
run: bash ./ci-scripts/osx/tahoma-buildopencv.sh
|
|
||||||
- name: Build Tahoma2D
|
|
||||||
run: bash ./ci-scripts/osx/tahoma-build.sh
|
|
||||||
- name: Create Package
|
|
||||||
run: bash ./ci-scripts/osx/tahoma-buildpkg.sh
|
|
||||||
- uses: actions/upload-artifact@v1
|
|
||||||
with:
|
|
||||||
name: Tahoma2D-osx.dmg
|
|
||||||
path: toonz/build/Tahoma2D-osx.dmg
|
|
23
.github/workflows/macOS_build.yml
vendored
Normal file
23
.github/workflows/macOS_build.yml
vendored
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
name: Tahoma2D macOS Build
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
macOS:
|
||||||
|
runs-on: macos-10.15
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: bash ./ci-scripts/osx/tahoma-install.sh
|
||||||
|
- name: Build ffmpeg
|
||||||
|
run: bash ./ci-scripts/osx/tahoma-buildffmpeg.sh
|
||||||
|
- name: Build OpenCV
|
||||||
|
run: bash ./ci-scripts/osx/tahoma-buildopencv.sh
|
||||||
|
- name: Build Tahoma2D
|
||||||
|
run: bash ./ci-scripts/osx/tahoma-build.sh
|
||||||
|
- name: Create Package
|
||||||
|
run: bash ./ci-scripts/osx/tahoma-buildpkg.sh
|
||||||
|
- uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: Tahoma2D-osx.dmg
|
||||||
|
path: toonz/build/Tahoma2D-osx.dmg
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
brew update
|
brew update
|
||||||
# from Homebrew 1.6.0 the old formula for obtaining Qt5.9.2 becomes invalid.
|
# Remove symlink to bin/2to3 in order for latest python to install
|
||||||
# so we start to use the latest version of Qt. (#1910)
|
rm -f '/usr/local/bin/2to3'
|
||||||
brew install boost qt clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm aom dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
|
brew install boost qt clang-format glew lz4 lzo libmypaint jpeg-turbo nasm yasm aom dav1d fontconfig freetype gnutls lame libass libbluray libsoxr libvorbis libvpx opencore-amr openh264 openjpeg opus rav1e sdl2 snappy speex tesseract theora webp xvid xz
|
||||||
# delete older qt versions and make sure to have only the latest
|
# delete older qt versions and make sure to have only the latest
|
||||||
brew cleanup qt
|
brew cleanup qt
|
||||||
|
|
Loading…
Reference in a new issue