Merge pull request #6532 from nulano/upload-fribidi

python-pillow · Oct 28, 2022 · 7adda3d · 7adda3d
2 parents b4bf288 + b8fc734
commit 7adda3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -194,6 +194,8 @@ jobs:
       id: wheel
       if: "github.event_name != 'pull_request'"
       run: |
+        mkdir fribidi\${{ matrix.architecture }}
+        copy winbuild\build\bin\fribidi* fribidi\${{ matrix.architecture }}
         setlocal EnableDelayedExpansion
         for %%f in (winbuild\build\license\*) do (
           set x=%%~nf
@@ -214,12 +216,20 @@ jobs:
         winbuild\\build\\build_pillow.cmd --disable-imagequant bdist_wheel
       shell: cmd
 
-    - uses: actions/upload-artifact@v3
+    - name: Upload wheel
+      uses: actions/upload-artifact@v3
       if: "github.event_name != 'pull_request'"
       with:
         name: ${{ steps.wheel.outputs.dist }}
         path: dist\*.whl
 
+    - name: Upload fribidi.dll
+      if: "github.event_name != 'pull_request' && matrix.python-version == 3.10"
+      uses: actions/upload-artifact@v3
+      with:
+        name: fribidi
+        path: fribidi\*
+
   success:
     permissions:
       contents: none

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
@@ -373,6 +373,7 @@ def cmd_msbuild(
         "dir": "fribidi-1.0.12",
         "license": "COPYING",
         "build": [
+            cmd_copy(r"COPYING", r"{bin_dir}\fribidi-1.0.12-COPYING"),
             cmd_copy(r"{winbuild_dir}\fribidi.cmake", r"CMakeLists.txt"),
             cmd_cmake(),
             cmd_nmake(target="clean"),