From ecf7baf98249819005d091cd2d2d2c0ac0ad8f15 Mon Sep 17 00:00:00 2001
From: Sean Vig <sean.v.775@gmail.com>
Date: Sat, 3 Aug 2024 21:09:08 -0400
Subject: [PATCH] Constrain xkbcommon version

---
 .github/workflows/release.yml | 73 +++++++++++------------------------
 dist-build-constraints.txt    |  1 +
 2 files changed, 24 insertions(+), 50 deletions(-)
 create mode 100644 dist-build-constraints.txt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d098e49..3d0a75ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -153,7 +153,7 @@ jobs:
       - name: Create artifact
         run: tar czf ~/wayland.tar.gz -C ${HOME}/wayland/ .
       - name: Upload built libraries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wayland
           path: ~/wayland.tar.gz
@@ -169,7 +169,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Download wayland libraries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wayland
       - name: Unpack wayland artifact
@@ -204,8 +204,10 @@ jobs:
           ls dist/
           auditwheel show dist/pywlroots-*.whl
           auditwheel repair --plat manylinux_2_28_x86_64 -w output_wheels dist/pywlroots-*.whl
+        env:
+          PIP_CONSTRAINT: dist-build-constraints.txt
       - name: Upload wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-${{ matrix.python-version }}
           path: output_wheels/*.whl
@@ -217,18 +219,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10"]
         pypy-version: ["7.3"]
     steps:
       - name: Download wayland libraries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wayland
       - name: Unpack wayland artifact
         run: tar xf wayland.tar.gz -C /
       - name: Set python version
         run: |
+          ls /opt/python/
           PYTHON_ROOT=$(find /opt/python -name pp${PYTHON_VERSION/./}-*_pp${PP_VERSION/./})
+          echo "${PYTHON_ROOT}"
           echo "${PYTHON_ROOT}/bin" >> $GITHUB_PATH
         shell: bash
         env:
@@ -257,8 +261,10 @@ jobs:
           ls dist/
           auditwheel show dist/pywlroots-*.whl
           auditwheel repair --plat manylinux_2_28_x86_64 -w output_wheels dist/pywlroots-*.whl
+        env:
+          PIP_CONSTRAINT: dist-build-constraints.txt
       - name: Upload wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels-pypy-${{ matrix.python-version }}
           path: output_wheels/*.whl
@@ -275,7 +281,6 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "pypy-3.8"
           - "pypy-3.9"
           - "pypy-3.10"
     steps:
@@ -285,11 +290,11 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             libxkbcommon-dev
       - name: Download wheels
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wheels-${{ matrix.python-version }}
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install wheel
@@ -314,7 +319,7 @@ jobs:
       python-version: "3.12"
     steps:
       - name: Download wayland libraries
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v5
         with:
           name: wayland
       - name: Unpack wayland artifact
@@ -346,8 +351,10 @@ jobs:
       - name: Build source
         run: |
           python -m build --sdist
+        env:
+          PIP_CONSTRAINT: dist-build-constraints.txt
       - name: Upload source
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: source
           path: dist/*.tar.gz
@@ -356,48 +363,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test-wheel, build-source]
     steps:
-      - name: Download wheels CPython 3.8
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-3.8
-          path: dist/
-      - name: Download wheels CPython 3.9
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-3.9
-          path: dist/
-      - name: Download wheels CPython 3.10
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-3.10
-          path: dist/
-      - name: Download wheels CPython 3.11
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-3.11
-          path: dist/
-      - name: Download wheels CPython 3.12
-        uses: actions/download-artifact@v3
+      - name: Download wheels
+        uses: actions/download-artifact@v4
         with:
-          name: wheels-3.12
+          pattern: wheels-*
           path: dist/
-      - name: Download wheels PyPy 3.8
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-pypy-3.8
-          path: dist
-      - name: Download wheels PyPy 3.9
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-pypy-3.9
-          path: dist
-      - name: Download wheels PyPy 3.10
-        uses: actions/download-artifact@v3
-        with:
-          name: wheels-pypy-3.10
-          path: dist
+          merge-multiple: true
       - name: Download source
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: source
           path: dist/
diff --git a/dist-build-constraints.txt b/dist-build-constraints.txt
new file mode 100644
index 00000000..d6b6fc27
--- /dev/null
+++ b/dist-build-constraints.txt
@@ -0,0 +1 @@
+xkbcommon<1.5