razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Include CanonSDK only on master builds

Browse source
This commit is contained in:
manongjohn 2021-04-23 08:03:20 -04:00
parent d1c72c4f3e
commit f11c72317e
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/macOS_build.yml vendored
View file

@ -21,6 +21,17 @@ jobs:
/Users/runner/work/tahoma2d/taoma2d/thirdparty/opencv /Users/runner/work/tahoma2d/taoma2d/thirdparty/opencv
key: ${{ runner.os }}-${{ github.sha }} key: ${{ runner.os }}-${{ github.sha }}
restore-keys: ${{ runner.os }}- restore-keys: ${{ runner.os }}-
- name: Get CanonSDK
if: ${{ github.event_name == 'push' }}
run: |
wget --header="Authorization: token ${{ secrets.CANONSDK_TOKEN }}" --header="Accept:application/octet-stream" -O EDSDK_v131231_Macintosh.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267390
unzip EDSDK_v131231_Macintosh.zip -d EDSDK_v131231_Macintosh
unzip EDSDK_v131231_Macintosh/Macintosh.dmg.zip -d EDSDK_v131231_Macintosh
7z x EDSDK_v131231_Macintosh/Macintosh.dmg -oEDSDK_v131231_Macintosh
mv EDSDK_v131231_Macintosh/Macintosh/EDSDK/* thirdparty/canon
- name: Get 3rd Party Apps
run: |
ci-scripts/osx/tahoma-get3rdpartyapps.sh
- name: Build ffmpeg - name: Build ffmpeg
run: | run: |
export PATH="/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/local/opt/ccache/libexec:$PATH"
@ -33,9 +44,6 @@ jobs:
run: | run: |
export PATH="/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/local/opt/ccache/libexec:$PATH"
ci-scripts/osx/tahoma-build.sh ci-scripts/osx/tahoma-build.sh
- name: Get 3rd Party Apps
run: |
ci-scripts/osx/tahoma-get3rdpartyapps.sh
- name: Create Package - name: Create Package
run: bash ./ci-scripts/osx/tahoma-buildpkg.sh run: bash ./ci-scripts/osx/tahoma-buildpkg.sh
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1

8
.github/workflows/windows_build.yml vendored
View file

@ -12,6 +12,14 @@ jobs:
- name: Install Dependencies - name: Install Dependencies
run: | run: |
ci-scripts\windows\tahoma-install.bat ci-scripts\windows\tahoma-install.bat
- name: Get CanonSDK
if: ${{ github.event_name == 'push' }}
run: |
curl -H "Authorization: token ${{ secrets.CANONSDK_TOKEN }}" -H "Accept:application/octet-stream" -fsSL -o EDSDK_v131231_Windows.zip https://api.github.com/repos/tahoma2d/CanonSDK/releases/assets/25267396
7z x EDSDK_v131231_Windows.zip -oEDSDK_v131231_Windows
move EDSDK_v131231_Windows\EDSDK\Header thirdparty\canon
move EDSDK_v131231_Windows\EDSDK_64\Dll thirdparty\canon
move EDSDK_v131231_Windows\EDSDK_64\Library thirdparty\canon
- name: Get 3rd Party Apps - name: Get 3rd Party Apps
run: | run: |
ci-scripts\windows\tahoma-get3rdpartyapps.bat ci-scripts\windows\tahoma-get3rdpartyapps.bat