Merge pull request #23 from PyO3/pypy

Collect PyPy DLLs

Author: messense

.github/workflows/dll.yml

@@ -10,29 +10,47 @@ jobs:
     name: Collect pythonXY.dll
     runs-on: windows-latest
     steps:
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "pypy3.8"
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "pypy3.9"
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.7"
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.8"
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.11-dev"
       - name: Copy pythonXY.dll
         shell: bash
         run: |
+          set -e
           for VER in 3.7 3.8 3.9 3.10 3.11; do
             VER_NUM=$(echo $VER | sed 's/\.//')
             PREFIX=$(py -$VER -c "import sys; print(sys.base_prefix, end='')")
             cp "$PREFIX/python$VER_NUM.dll" .
           done
+
+          # PyPy 3.7 & 3.8 uses libpypy3-c.dll
+          PREFIX=$(pypy3.8 -c "import sys; print(sys.base_prefix, end='')")
+          cp "$PREFIX/libpypy3-c.dll" .
+
+          # PyPy 3.9 and later use libpypy3.Y-c.dll
+          for VER in 3.9; do
+            VER_NUM=$(echo $VER | sed 's/\.//')
+            PREFIX=$(pypy$VER -c "import sys; print(sys.base_prefix, end='')")
+            cp "$PREFIX/libpypy$VER-c.dll" .
+          done
           ls *.dll
       - name: Upload DLLs
         uses: actions/upload-artifact@v2

.github/workflows/update.yml

@@ -54,7 +54,7 @@ jobs:
       shell: bash
       run: |
         set -e
-        for f in dll/python*.dll; do
+        for f in dll/*.dll; do
           gendef $f
         done
         ls -lrth *.def
@@ -65,6 +65,6 @@ jobs:
         branch: update-pythonxy
         delete-branch: true
         add-paths: |
-          src/python*.def
+          src/*.def
         title: 'Update pythonXY.def'
         commit-message: 'chore: Update pythonXY.def'