From 554940d6e8125cc865cb713f4613cde84a533250 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 17:21:32 -0400 Subject: [PATCH 1/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41051853..40befa64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,4 +56,4 @@ jobs: with: tag_name: latest files: | - *.whl + artifact/*.whl From 01a548b8f46c85333a3329ee6622ae0b437fac70 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 21:27:54 -0400 Subject: [PATCH 2/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40befa64..d4ab69af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: python-version: ["3.10", "3.11", "pypy3.10"] - os: ["ubuntu-latest", "macos-latest"] + os: ["ubuntu-latest", "macos-latest", "self-hosted"] steps: - name: Checkout uses: "actions/checkout@v3" From 9733d5f635f5a99d81bf372299cb1015b268f5b8 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 15:45:34 -0400 Subject: [PATCH 3/8] Update ci.yml --- .github/workflows/ci.yml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4ab69af..41d881f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10", "3.11", "pypy3.10"] - os: ["ubuntu-latest", "macos-latest", "self-hosted"] + python-version: ["cp310", "cp311", "pp310"] + os: ["ubuntu-latest", "macos-latest"] steps: - name: Checkout uses: "actions/checkout@v3" @@ -27,17 +27,27 @@ jobs: - name: Disable AppArmor run: sudo aa-disable /usr/sbin/slapd if: runner.os == 'Linux' - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - name: Set up QEMU for multi-arch build + # Check https://github.com/docker/setup-qemu-action for newer versions. + uses: docker/setup-qemu-action@v2 + if: runner.os == 'Linux' with: - python-version: ${{ matrix.python-version }} - - name: "Install Python dependencies" - run: | - set -xe - python -V - python -m pip install --upgrade pip setuptools build - - name: "build python-ldap ${{ matrix.python-version }}" - run: "python -m build" + # Note: 6.2.0 is buggy: make sure to avoid it. + # See https://github.com/pypa/cibuildwheel/issues/1250 + image: tonistiigi/binfmt:qemu-v7.0.0 + - name: Build wheels + uses: pypa/cibuildwheel@v2.14.1 + env: + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 + CIBW_MANYLINUX_I686_IMAGE: manylinux2014 + CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 + CIBW_MANYLINUX_PPC64LE_IMAGE: manylinux2014 + CIBW_BUILD: ${{matrix.python-version}}-* + CIBW_ARCHS_LINUX: x86_64 aarch64 + CIBW_ARCHS_MACOS: x86_64 arm64 universal2 + CIBW_BEFORE_ALL_LINUX: >- + sudo apt update + && sudo apt install -y ldap-utils slapd enchant-2 libldap2-dev libsasl2-dev apparmor-utils - name: Upload a Build Artifact uses: actions/upload-artifact@v3 with: From 44f01ed67548b4ac29e655fea42ab73baca23655 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 15:50:05 -0400 Subject: [PATCH 4/8] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41d881f2..ad78381e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,8 +46,7 @@ jobs: CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_ARCHS_MACOS: x86_64 arm64 universal2 CIBW_BEFORE_ALL_LINUX: >- - sudo apt update - && sudo apt install -y ldap-utils slapd enchant-2 libldap2-dev libsasl2-dev apparmor-utils + cat /etc/os-release - name: Upload a Build Artifact uses: actions/upload-artifact@v3 with: From 41b54039e7e63f83fbbeee5815fb8e840b010bec Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 15:53:32 -0400 Subject: [PATCH 5/8] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad78381e..bc750b55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,8 @@ jobs: CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_ARCHS_MACOS: x86_64 arm64 universal2 CIBW_BEFORE_ALL_LINUX: >- - cat /etc/os-release + yum groupinstall "Development tools" + && yum install openldap-devel python-devel - name: Upload a Build Artifact uses: actions/upload-artifact@v3 with: From db57843e8ea73fe910ff25b5753ea4823ea703db Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 15:58:11 -0400 Subject: [PATCH 6/8] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc750b55..93de4ea6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,8 +46,8 @@ jobs: CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_ARCHS_MACOS: x86_64 arm64 universal2 CIBW_BEFORE_ALL_LINUX: >- - yum groupinstall "Development tools" - && yum install openldap-devel python-devel + yum -y groupinstall "Development tools" + && yum -y install openldap-devel python-devel - name: Upload a Build Artifact uses: actions/upload-artifact@v3 with: From 4f2a7eb1cc653c3a33e7b1bc76e469f2a455ecbe Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 16:06:25 -0400 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93de4ea6..d49e768f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: uses: actions/upload-artifact@v3 with: # A file, directory or wildcard pattern that describes what to upload - path: dist/*.whl + path: wheelhouse/*.whl release: name: "Release" needs: build From 5deaeb79ea125a4b2f0c7d229b2562f0a1d8ba64 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Thu, 10 Aug 2023 16:30:21 -0400 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d49e768f..0b2d94e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,10 +39,9 @@ jobs: uses: pypa/cibuildwheel@v2.14.1 env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 - CIBW_MANYLINUX_PPC64LE_IMAGE: manylinux2014 CIBW_BUILD: ${{matrix.python-version}}-* + CIBW_SKIP: "*musllinux*" CIBW_ARCHS_LINUX: x86_64 aarch64 CIBW_ARCHS_MACOS: x86_64 arm64 universal2 CIBW_BEFORE_ALL_LINUX: >-