From 50eb143f52d7b764c7d65e58e66e090f32c4ac80 Mon Sep 17 00:00:00 2001 From: Michael Sasser Date: Thu, 10 Oct 2024 06:44:35 +0200 Subject: [PATCH] fix(ci): Use a version matrix and let rye pin the python version --- .github/workflows/ci.yml | 16 +++++++++++----- .github/workflows/docs.yml | 12 +++++++----- .github/workflows/release.yml | 12 +++++++----- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bad94a56..fe31f52a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,15 +27,18 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12"] steps: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Set up Python 3.12 - uses: actions/setup-python@v5.2.0 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5.2.0 + # with: + # python-version: "${{ matrix.python-version }}" - name: Setup Rye id: setup-rye @@ -43,10 +46,13 @@ jobs: with: version: "0.41.0" enable-cache: true + cache-prefix: python-${{ matrix.python-version }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Project Dependencies - run: rye sync --all-features --no-lock + run: | + rye pin --no-update-requires-python '${{ matrix.python-version }}' + rye sync --all-features --no-lock - name: Run pre-commit run: | diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9e3bb25b..1286d57c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,10 +29,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Set up Python 3.12 - uses: actions/setup-python@v5.2.0 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5.2.0 + # with: + # python-version: "3.12" - name: Setup Rye id: setup-rye @@ -42,7 +42,9 @@ jobs: version: "0.41.0" - name: Install Project Dependencies - run: rye sync --all-features --no-lock + run: | + rye pin --no-update-requires-python '3.12' + rye sync --all-features --no-lock - name: Make docs working-directory: ${{env.working-directory}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e18ae716..5300b406 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,10 +28,10 @@ jobs: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Set up Python 3.12 - uses: actions/setup-python@v5.2.0 - with: - python-version: "3.12" + # - name: Set up Python 3.12 + # uses: actions/setup-python@v5.2.0 + # with: + # python-version: "3.12" - name: Setup Rye id: setup-rye @@ -42,7 +42,9 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: Install Project Dependencies - run: rye sync --all-features --no-lock + run: | + rye pin --no-update-requires-python '3.12' + rye sync --all-features --no-lock - name: Build project run: rye build --all --clean