From 03a80f8cdd815262d018a5345c7ae17629441fff Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 15:32:27 -0400 Subject: [PATCH 1/8] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86e8ba51..a89ab1e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"] + python-version: ["3.10", "3.11", "pypy3"] steps: - name: Checkout uses: "actions/checkout@v2" @@ -32,7 +32,7 @@ jobs: run: | set -xe python -V - python -m pip install --upgrade pip setuptools + python -m pip install --upgrade pip setuptools build python -m pip install --upgrade tox tox-gh-actions - - name: "Test tox with Python ${{ matrix.python-version }}" - run: "python -m tox" + - name: "build python-ldap ${{ matrix.python-version }}" + run: "python -m build" From 3c8076aeed50ff2dd0ccabb95a441a0d70840109 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 15:33:17 -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 a89ab1e1..38c58d82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ --- name: CI -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] permissions: contents: read From 4ec323aa9972c0ec321d7016257eb9652fa6eed0 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 15:38:17 -0400 Subject: [PATCH 3/8] Update ci.yml --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38c58d82..fc9894dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,3 +36,8 @@ jobs: python -m pip install --upgrade tox tox-gh-actions - name: "build python-ldap ${{ matrix.python-version }}" run: "python -m build" + - name: Upload a Build Artifact + uses: actions/upload-artifact@v3.1.2 + with: + # A file, directory or wildcard pattern that describes what to upload + path: dist/* From bb5f446be13098d5f101e8bc6128b3462b87ff1e Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 16:04:05 -0400 Subject: [PATCH 4/8] Update ci.yml --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc9894dc..3ef2b828 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,23 +9,26 @@ permissions: jobs: distros: name: "Ubuntu with Python ${{ matrix.python-version }}" - runs-on: "ubuntu-20.04" + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: python-version: ["3.10", "3.11", "pypy3"] + os: ["ubuntu-latest", "macos-latest"] steps: - name: Checkout - uses: "actions/checkout@v2" + uses: "actions/checkout@v3" - name: Install apt dependencies run: | set -ex sudo apt update sudo apt install -y ldap-utils slapd enchant-2 libldap2-dev libsasl2-dev apparmor-utils + if: runner.os == 'Linux' - 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@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: "Install Python dependencies" @@ -33,7 +36,6 @@ jobs: set -xe python -V python -m pip install --upgrade pip setuptools build - python -m pip install --upgrade tox tox-gh-actions - name: "build python-ldap ${{ matrix.python-version }}" run: "python -m build" - name: Upload a Build Artifact From 224c4b787665860bade59ff9dc04c20c10862c03 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 16:05:12 -0400 Subject: [PATCH 5/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 3ef2b828..f9e10bef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ permissions: jobs: distros: - name: "Ubuntu with Python ${{ matrix.python-version }}" + name: "${{ matrix.os }} with Python ${{ matrix.python-version }}" runs-on: ${{ matrix.os }} strategy: fail-fast: false From af4a28dd8d35f63d19dd3098f90fca7ec8e160b2 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 16:43:23 -0400 Subject: [PATCH 6/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 f9e10bef..87b0e627 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.10", "3.11", "pypy3"] + python-version: ["3.10", "3.11", "pypy3.10"] os: ["ubuntu-latest", "macos-latest"] steps: - name: Checkout From 98fa248db27f13359d35495926868fd7a07f3608 Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 17:01:21 -0400 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87b0e627..78f595a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,10 +4,10 @@ name: CI on: [push, pull_request, workflow_dispatch] permissions: - contents: read + contents: write jobs: - distros: + build: name: "${{ matrix.os }} with Python ${{ matrix.python-version }}" runs-on: ${{ matrix.os }} strategy: @@ -39,7 +39,20 @@ jobs: - name: "build python-ldap ${{ matrix.python-version }}" run: "python -m build" - name: Upload a Build Artifact - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v3 with: # A file, directory or wildcard pattern that describes what to upload - path: dist/* + path: dist/*.whl + release: + name: "Release" + runs-on: ubuntu-latest + steps: + - name: Download Artifacts + # will download and upack all files from the default artifact named 'artifact' + uses: actions/download-artifact@v3 + - name: GH Release + uses: softprops/action-gh-release@v0.1 + with: + name: latest + files: | + *.whl From e52a1cfe3c4c699b5622c9c96ca6976266bd2cdf Mon Sep 17 00:00:00 2001 From: Alex Tremblay Date: Wed, 9 Aug 2023 17:05:12 -0400 Subject: [PATCH 8/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 78f595a6..44df920a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,13 +45,14 @@ jobs: path: dist/*.whl release: name: "Release" + needs: build runs-on: ubuntu-latest steps: - name: Download Artifacts # will download and upack all files from the default artifact named 'artifact' uses: actions/download-artifact@v3 - name: GH Release - uses: softprops/action-gh-release@v0.1 + uses: softprops/action-gh-release@v0.1.15 with: name: latest files: |