-
Notifications
You must be signed in to change notification settings - Fork 1
Fixed wheel build. #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4787f2c
Fixed wheel build.
khustup2 966dede
Remove unneeded path
khustup2 530dda1
Remove unneeded install.
khustup2 def3ced
Fix mac x86-64 build.
khustup2 d1cff5d
possible fix
activesoull b167ddf
ssh
activesoull eb50cf5
possible fix
activesoull 2b57212
remove ssh
activesoull ede0402
cleanup
activesoull File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -23,10 +23,20 @@ on: | |||||
| description: "Build Linux ARM Wheels" | ||||||
| type: boolean | ||||||
| default: true | ||||||
| runner: | ||||||
| description: Choose MacOS Action Runner Type | ||||||
| type: choice | ||||||
| options: | ||||||
| - "self-hosted" | ||||||
| - "macos-12" | ||||||
| - "macos-13" | ||||||
| - "macos-14" | ||||||
| - "macos-15" | ||||||
| default: "self-hosted" | ||||||
|
|
||||||
| env: | ||||||
| VCPKG_ROOT: "${{ github.workspace }}/vcpkg" | ||||||
| VCPKG_FEATURE_FLAGS: "dependencygraph" | ||||||
| VCPKG_ROOT: ${{ github.workspace }}/vcpkg | ||||||
| VCPKG_FEATURE_FLAGS: dependencygraph | ||||||
| VCPKG_DISABLE_METRICS: true | ||||||
| BUILD_PRESET: "release" | ||||||
|
|
||||||
|
|
@@ -67,42 +77,111 @@ jobs: | |||||
| build_wheels-macos: | ||||||
| name: MacOS Wheels Build | ||||||
| needs: [get_macos_matrix] | ||||||
| runs-on: self-hosted-${{ matrix.type }} | ||||||
| runs-on: ${{ inputs.runner }}-${{ matrix.type }} | ||||||
| strategy: | ||||||
| fail-fast: false | ||||||
| matrix: | ||||||
| include: ${{ fromJSON(needs.get_macos_matrix.outputs.matrix) }} | ||||||
| env: | ||||||
| VCPKG_BINARY_SOURCES: "clear;files,/Users/sre/GitHub/vcpkg-cache-deepframe-${{ matrix.type }},readwrite" | ||||||
|
|
||||||
| steps: | ||||||
| - name: set platform name | ||||||
| id: platform-name | ||||||
| shell: bash | ||||||
| env: | ||||||
| TYPE: ${{ matrix.type }} | ||||||
| run: | | ||||||
| case "${TYPE}" in | ||||||
| xlarge) | ||||||
| echo "platform=macosx_11_0_arm64" >> $GITHUB_OUTPUT | ||||||
| echo "arch=arm64" >> $GITHUB_OUTPUT | ||||||
| echo "triplet=arm64-osx" >> $GITHUB_OUTPUT | ||||||
| ;; | ||||||
| large) | ||||||
| echo "platform=macosx_10_9_x86_64" >> $GITHUB_OUTPUT | ||||||
| echo "arch=x86_64" >> $GITHUB_OUTPUT | ||||||
| echo "triplet=x64-osx" >> $GITHUB_OUTPUT | ||||||
| ;; | ||||||
| esac | ||||||
|
|
||||||
| - name: set vcpkg cache path | ||||||
| id: vcpkg-cache | ||||||
| shell: bash | ||||||
| env: | ||||||
| ARCH: ${{ steps.platform-name.outputs.arch }} | ||||||
| run: | | ||||||
| echo "cache_path=/Users/sre/GitHub/vcpkg-cache-deepframe-${{ steps.platform-name.outputs.triplet }}" >> $GITHUB_OUTPUT | ||||||
|
|
||||||
| - name: clone repository | ||||||
| uses: actions/checkout@v4.2.2 | ||||||
|
|
||||||
| - name: setup python ${{ matrix.python }} | ||||||
| uses: actions/setup-python@v5.3.0 | ||||||
| if: inputs.runner != 'self-hosted' | ||||||
| with: | ||||||
| python-version: ${{ matrix.python }} | ||||||
|
|
||||||
| - name: setup python ${{ matrix.python }} environment | ||||||
| id: setup | ||||||
| shell: bash | ||||||
| run: |- | ||||||
| python${{ matrix.python }} -m venv "venv_${{ matrix.venv }}" | ||||||
| source "venv_${{ matrix.venv }}/bin/activate" | ||||||
| python"${{ matrix.python }}" -m pip install -qqq -U pip setuptools build; deactivate | ||||||
| python"${{ matrix.python }}" -m pip install -qqq -U pip setuptools build cmake==3.29.2 | ||||||
| deactivate | ||||||
| echo -e "\n[bdist_wheel]\nplat-name = ${{ steps.platform-name.outputs.platform }}" >> setup.cfg | ||||||
|
|
||||||
| - name: install vcpkg | ||||||
| shell: bash | ||||||
| run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 1de2026f28ead93ff1773e6e680387643e914ea1 && ./bootstrap-vcpkg.sh | ||||||
| run: git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 6f29f12e82a8293156836ad81cc9bf5af41fe836 && ./bootstrap-vcpkg.sh | ||||||
|
|
||||||
| - name: install vcpkg dependencies | ||||||
| shell: bash | ||||||
| env: | ||||||
| VCPKG_ROOT: ${{ github.workspace }}/vcpkg | ||||||
| VCPKG_TARGET_TRIPLET: ${{ steps.platform-name.outputs.triplet }} | ||||||
| VCPKG_HOST_TRIPLET: ${{ steps.platform-name.outputs.triplet }} | ||||||
| run: | | ||||||
| cd vcpkg | ||||||
| ./vcpkg install --triplet=${{ steps.platform-name.outputs.triplet }} openssl liblzma libiconv zlib | ||||||
| cd .. | ||||||
|
|
||||||
| - name: clean build artifacts | ||||||
| shell: bash | ||||||
| run: | | ||||||
| # Clean build directory to ensure fresh build | ||||||
| rm -rf build | ||||||
| # Clean architecture-specific FFmpeg installations | ||||||
| rm -rf .ext-* | ||||||
|
|
||||||
|
|
||||||
|
|
||||||
| - name: build py${{ matrix.python }} | ||||||
| env: | ||||||
| CMAKE_OSX_ARCHITECTURES: ${{ steps.platform-name.outputs.arch }} | ||||||
| VCPKG_TARGET_TRIPLET: ${{ steps.platform-name.outputs.triplet }} | ||||||
| VCPKG_HOST_TRIPLET: ${{ steps.platform-name.outputs.triplet }} | ||||||
| VCPKG_BINARY_SOURCES: "clear" | ||||||
| VCPKG_DISABLE_METRICS: true | ||||||
| VCPKG_OVERLAY_TRIPLETS: "" | ||||||
| VCPKG_OVERLAY_PORTS: "" | ||||||
| shell: bash | ||||||
| run: |- | ||||||
| CMAKE_PATH=$(whereis cmake | awk '{print $2}') | ||||||
|
||||||
| CMAKE_PATH=$(whereis cmake | awk '{print $2}') | |
| CMAKE_PATH=$(command -v cmake) |
khustup2 marked this conversation as resolved.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.