From c3f9a6024ec259d744456e2ef4329cccddbe4121 Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 14:34:10 +0800 Subject: [PATCH 1/7] ci: try to fix tests on macos-arm64 --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fbea5f26..913855514 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,13 @@ jobs: run: | brew install mpv + - name: Setup DYLD path for macos-arm64 + if: matrix.os == 'macos-latest' + run: | + # Python can't find libmpv on macOS arm64 by default. + # This problem does not exist on macOS with x86_64. + echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" > $GITHUB_ENV + - name: Install Windows Dependencies if: startsWith(matrix.os, 'windows') run: | From 767c44ce34a63957852726e2412a99c08e17bc84 Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 14:36:07 +0800 Subject: [PATCH 2/7] minor fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 913855514..33d091ff1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,7 @@ jobs: run: | # Python can't find libmpv on macOS arm64 by default. # This problem does not exist on macOS with x86_64. - echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" > $GITHUB_ENV + echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV - name: Install Windows Dependencies if: startsWith(matrix.os, 'windows') From 40944e09e8d0bfc8d2800fba640ba1ce73634f97 Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 14:40:57 +0800 Subject: [PATCH 3/7] fix for macos-release workflow --- .github/workflows/macos-release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index 36766b167..e784e6503 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -32,6 +32,12 @@ jobs: - name: Install libmpv run: | brew install mpv + - name: Setup DYLD path for macos-arm64 + if: matrix.os == 'macos-latest' + run: | + # Python can't find libmpv on macOS arm64 by default. + # This problem does not exist on macOS with x86_64. + echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV - name: Bundle run: | make bundle From ad46ffa5f6cf579af9695080c8a244c7672190aa Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 18:20:34 +0800 Subject: [PATCH 4/7] debug test case --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 372e7c44f..929bc8f77 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ unittest: pytest pytest: # Disable faulthandler plugin, because it cause verbose output on windows. # Besides, the fault currently cause no side effects. - TEST_ENV=travis QT_QPA_PLATFORM=offscreen pytest -p no:faulthandler + TEST_ENV=travis QT_QPA_PLATFORM=offscreen pytest -vvv -p no:faulthandler integration_test: export QT_QPA_PLATFORM=offscreen integration_test: From e10feec7151081347b0bcb8867ff9aed47117e4a Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 18:53:28 +0800 Subject: [PATCH 5/7] use fallback_path --- .github/workflows/macos-release.yml | 3 ++- Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index ba7c64620..1e014baeb 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -37,7 +37,8 @@ jobs: run: | # Python can't find libmpv on macOS arm64 by default. # This problem does not exist on macOS with x86_64. - echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV + echo "DYLD_FALLBACK_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV + echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks >> $GITHUB_ENV - name: Test if no syntax error run: feeluown -h - name: Bundle diff --git a/Makefile b/Makefile index 929bc8f77..372e7c44f 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ unittest: pytest pytest: # Disable faulthandler plugin, because it cause verbose output on windows. # Besides, the fault currently cause no side effects. - TEST_ENV=travis QT_QPA_PLATFORM=offscreen pytest -vvv -p no:faulthandler + TEST_ENV=travis QT_QPA_PLATFORM=offscreen pytest -p no:faulthandler integration_test: export QT_QPA_PLATFORM=offscreen integration_test: From 168dad0cf67f5fd0dec03085fc08b2d319cfcc80 Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 19:03:20 +0800 Subject: [PATCH 6/7] update build.yaml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33d091ff1..619335b66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,7 +43,8 @@ jobs: run: | # Python can't find libmpv on macOS arm64 by default. # This problem does not exist on macOS with x86_64. - echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV + echo "DYLD_FALLBACK_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV + echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks >> $GITHUB_ENV - name: Install Windows Dependencies if: startsWith(matrix.os, 'windows') From 1e0e3c7f0471b0fb50f4b9c8c573c1361ffa3008 Mon Sep 17 00:00:00 2001 From: cosven Date: Sun, 30 Jun 2024 19:05:37 +0800 Subject: [PATCH 7/7] fix --- .github/workflows/build.yml | 2 +- .github/workflows/macos-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 619335b66..20a6d3458 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: # Python can't find libmpv on macOS arm64 by default. # This problem does not exist on macOS with x86_64. echo "DYLD_FALLBACK_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV - echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks >> $GITHUB_ENV + echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks" >> $GITHUB_ENV - name: Install Windows Dependencies if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index 1e014baeb..7df48cf96 100644 --- a/.github/workflows/macos-release.yml +++ b/.github/workflows/macos-release.yml @@ -38,7 +38,7 @@ jobs: # Python can't find libmpv on macOS arm64 by default. # This problem does not exist on macOS with x86_64. echo "DYLD_FALLBACK_LIBRARY_PATH=/opt/homebrew/lib" >> $GITHUB_ENV - echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks >> $GITHUB_ENV + echo "DYLD_FALLBACK_FRAMEWORK_PATH=/opt/homebrew/Frameworks" >> $GITHUB_ENV - name: Test if no syntax error run: feeluown -h - name: Bundle