f

m000 · Nov 5, 2023 · e5be3c3 · e5be3c3
1 parent d81770a
commit e5be3c3
Show file tree

Hide file tree

Showing 3 changed files with 414 additions and 24 deletions.
diff --git a/.github/workflows/j2cli.yml b/.github/workflows/j2cli.yml
@@ -9,28 +9,41 @@ concurrency:
   cancel-in-progress: true
 jobs:
   test:
-    runs-on: ubuntu-latest
-    env:
-      TOXENV: py3.10-pyyaml6
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ "ubuntu-latest" ]
+        python-version: [ "3.10", "3.11" ]
+    runs-on: ${{ matrix.os }}
+#   env:
+#     TOXENV: py${{ matrix.python-version }}-pyyaml6
     steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: actions/setup-python@v4.7.0
+    - name: Repository checkout
+      uses: actions/checkout@v4
+    - name: Python ${{ matrix.python-version }} setup
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
-    - run: pip install tox
-    - run: tox
-  coverage:
-    runs-on: ubuntu-latest
-    env:
-      TOXENV: py3.10-pyyaml6
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: actions/setup-python@v4.7.0
+        python-version: ${{ matrix.python-version }}
+    - name: Load cached Poetry installation
+      id: cached-poetry
+      uses: actions/cache@v3
+      with:
+        path: ~/.local  # the path depends on the OS
+        key: poetry-0  # increment to reset cache
+    - name: Install Poetry
+      if: steps.cached-poetry.outputs.cache-hit != 'true'
+      uses: snok/install-poetry@v1
       with:
-        python-version: "3.10"
-    - uses: orgoro/coverage@v3.1
+        version: 1.7.0
+        virtualenvs-create: true
+        virtualenvs-in-project: true  # create .venv in test directory
+    - name: Install Poetry development dependencies  # main dependencies are handled by tox
+      if: steps.cached-poetry.outputs.cache-hit != 'true'
+      run: poetry install --no-interaction --no-root --only=dev
+    - name: Load cached tox environment
+      id: cached-toxenv
+      uses: actions/cache@v3
       with:
-        coverageFile: coverage.xml
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - run: pip install tox
-    - run: tox
+        path: .tox/py${{ matrix.python-version }}-**
+        key: toxenv-py${{ matrix.python-version }}-${{ hashFiles('tox.ini') }}
+    - run: poetry run tox