Allow install under pypy (#2559)

[etc/vim.git] / .github / workflows / upload_binary.yml

diff --git a/.github/workflows/upload_binary.yml b/.github/workflows/upload_binary.yml
index 46d92ab21491a130c39b7ee236ee11451c8dd57f..8f44d4ec27b5eaa90102102c9fbda1333a66d4c4 100644 (file)
--- a/.github/workflows/upload_binary.yml
+++ b/.github/workflows/upload_binary.yml
@@ -10,25 +10,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
     strategy:
       fail-fast: false
       matrix:

-        python-version: [3.7]
-        os: [ubuntu-16.04, windows-2019]
+        os: [windows-2019, ubuntu-20.04, macos-latest]

         include:
           - os: windows-2019
             pathsep: ";"
         include:
           - os: windows-2019
             pathsep: ";"

-            executable_suffix: ".exe"
+            asset_name: black_windows.exe

             executable_mime: "application/vnd.microsoft.portable-executable"
             executable_mime: "application/vnd.microsoft.portable-executable"

-          - os: ubuntu-16.04
+            platform: windows
+          - os: ubuntu-20.04

             pathsep: ":"
             pathsep: ":"

-            executable_suffix: ".elf"
+            asset_name: black_linux

             executable_mime: "application/x-executable"
             executable_mime: "application/x-executable"

+            platform: unix
+          - os: macos-latest
+            pathsep: ":"
+            asset_name: black_macos
+            executable_mime: "application/x-mach-binary"
+            platform: macos

 
     steps:
       - uses: actions/checkout@v2
 
 
     steps:
       - uses: actions/checkout@v2
 

-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up latest Python

         uses: actions/setup-python@v2
         with:
         uses: actions/setup-python@v2
         with:

-          python-version: ${{ matrix.python-version }}
+          python-version: "*"

 
       - name: Install dependencies
         run: |
 
       - name: Install dependencies
         run: |


@@ -37,8 +43,10 @@ jobs:
           python -m pip install pyinstaller
 
       - name: Build binary
           python -m pip install pyinstaller
 
       - name: Build binary

-        run: |
-          python -m PyInstaller -F --name black${{ matrix.executable_suffix }} --add-data 'src/blib2to3${{ matrix.pathsep }}blib2to3' src/black/__main__.py
+        run: >
+          python -m PyInstaller -F --name ${{ matrix.asset_name }} --add-data
+          'src/blib2to3${{ matrix.pathsep }}blib2to3' --hidden-import platformdirs.${{
+          matrix.platform }} src/black/__main__.py

 
       - name: Upload binary as release asset
         uses: actions/upload-release-asset@v1
 
       - name: Upload binary as release asset
         uses: actions/upload-release-asset@v1


@@ -46,6 +54,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}

-          asset_path: dist/black${{ matrix.executable_suffix }}
-          asset_name: black${{ matrix.executable_suffix }}
+          asset_path: dist/${{ matrix.asset_name }}
+          asset_name: ${{ matrix.asset_name }}

           asset_content_type: ${{ matrix.executable_mime }}
           asset_content_type: ${{ matrix.executable_mime }}