From 01e7ad9b01af49855e35167b72190d4015068050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi@yaal.coop>
Date: Sun, 13 Aug 2023 13:10:27 +0200
Subject: [PATCH] chore: GHA refactoring

---
 .github/workflows/tests.yaml | 44 ++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index daf7e413..13321cf2 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,60 +23,56 @@ jobs:
           - '3.8'
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
+          cache: 'poetry'
       - name: Update apt repositories
         run: sudo apt update
       - name: Install apt dependencies
         run: sudo apt --yes install apparmor-utils libsasl2-dev python3-dev libldap2-dev libssl-dev slapd ldap-utils
       - name: App armor configuration for slapd
         run: sudo aa-complain /usr/sbin/slapd
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: pip|${{ hashFiles('setup.py') }}|${{ hashFiles('tox.ini') }}
-      - run: pip install --upgrade tox "poetry>1.3.0" coveralls pyyaml tomli
-      - run: tox -e py
-  style:
+      - run: poetry install
+      - run: poetry run pytest
+  minversions:
+    name: minimum dependency versions
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.11'
+          cache: 'poetry'
       - name: Update apt repositories
         run: sudo apt update
       - name: Install apt dependencies
         run: sudo apt --yes install apparmor-utils libsasl2-dev python3-dev libldap2-dev libssl-dev slapd ldap-utils
       - name: App armor configuration for slapd
         run: sudo aa-complain /usr/sbin/slapd
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: pip|${{ hashFiles('setup.py') }}|${{ hashFiles('tox.ini') }}
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit|${{ hashFiles('.pre-commit-config.yaml') }}
-      - run: pip install --upgrade tox "poetry>1.3.0" coveralls pyyaml tomli
-      - run: tox -e style
+      - name: Force minimum dependency versions
+        run: sed -i -E 's/"(\^|>=)([0-9])/"==\2/' pyproject.toml
+      - run: poetry install
+      - run: poetry run pytest
+  style:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/action@v3.0.0
   doc:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.11'
+          cache: 'poetry'
       - name: Update apt repositories
         run: sudo apt update
       - name: Install apt dependencies
         run: sudo apt --yes install apparmor-utils libsasl2-dev python3-dev libldap2-dev libssl-dev slapd ldap-utils
       - name: App armor configuration for slapd
         run: sudo aa-complain /usr/sbin/slapd
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: pip|${{ hashFiles('setup.py') }}|${{ hashFiles('tox.ini') }}
       - run: pip install --upgrade tox "poetry>1.3.0" coveralls pyyaml tomli
       - run: tox -e doc