From 3d011c9cad1c78dec08e3c66cdcef06c11400fe2 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 3 Dec 2024 20:30:12 -0500 Subject: [PATCH] Update versions in GitHub workflows --- .github/workflows/pre-merge.yaml | 12 ++++++------ .github/workflows/push_poetry_container.yaml | 20 ++++++++++---------- .github/workflows/update-poetry-cache.yaml | 14 +++++++------- tests/__init__.py | 1 + 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index bf2b1c8c..1e2bb51a 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -10,15 +10,15 @@ on: jobs: pre-merge: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: - python-version: ["3.8", "3.10"] + python-version: ["3.10", "3.12"] include: - - python-version: "3.8" - python-py-version: "py38" - python-version: "3.10" python-py-version: "py310" + - python-version: "3.12" + python-py-version: "py312" container: image: ghcr.io/${{ github.repository }}-ci:${{ matrix.python-py-version }}-poetry-bullseye credentials: @@ -26,14 +26,14 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Poetry Venv Dir run: | echo "VENV_DIR=$(poetry config virtualenvs.path)" >> $GITHUB_ENV - name: Restore the Cache id: cache-deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.VENV_DIR }} # bump the suffix if you need to force-refresh the cache diff --git a/.github/workflows/push_poetry_container.yaml b/.github/workflows/push_poetry_container.yaml index 20d2eb88..98cdc83d 100644 --- a/.github/workflows/push_poetry_container.yaml +++ b/.github/workflows/push_poetry_container.yaml @@ -4,10 +4,10 @@ env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }}-ci POETRY_VERSION: 1.3.2 - PYTHON_PRIMARY_VERSION: 3.8.16 - PYTHON_PRIMARY_TAG: py38 - PYTHON_SECONDARY_VERSION: 3.10.9 - PYTHON_SECONDARY_TAG: py310 + PYTHON_PRIMARY_VERSION: 3.10.16 + PYTHON_PRIMARY_TAG: py310 + PYTHON_SECONDARY_VERSION: 3.12.8 + PYTHON_SECONDARY_TAG: py312 DEBIAN_VERSION: bullseye on: @@ -20,22 +20,22 @@ on: jobs: push-poetry-container: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: read packages: write steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to GCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Metadata id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Echo @@ -48,7 +48,7 @@ jobs: echo "TAGS: ${{ steps.meta.outputs.tags }}" echo "LABELS: ${{ steps.meta.outputs.labels }}" - name: Image - poetry${{ env.POETRY_VERSION }}-python${{ env.PYTHON_PRIMARY_VERSION }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: file: ./.devcontainer/Dockerfile push: true @@ -61,7 +61,7 @@ jobs: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:python${{ env.PYTHON_PRIMARY_VERSION }}-poetry${{ env.POETRY_VERSION }}-${{ env.DEBIAN_VERSION }} labels: ${{ steps.meta.outputs.labels }} - name: Image - poetry${{ env.POETRY_VERSION }}-python${{ env.PYTHON_SECONDARY_VERSION }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: file: ./.devcontainer/Dockerfile push: true diff --git a/.github/workflows/update-poetry-cache.yaml b/.github/workflows/update-poetry-cache.yaml index 81b70c60..aef09b38 100644 --- a/.github/workflows/update-poetry-cache.yaml +++ b/.github/workflows/update-poetry-cache.yaml @@ -17,15 +17,15 @@ on: jobs: update-poetry-cache: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: - python-version: ["3.8", "3.10"] + python-version: ["3.10", "3.12"] include: - - python-version: "3.8" - python-py-version: "py38" - python-version: "3.10" - python-py-version: "py310" + python-py-version: "py10" + - python-version: "3.12" + python-py-version: "py312" container: image: ghcr.io/${{ github.repository }}-ci:${{ matrix.python-py-version }}-poetry-bullseye credentials: @@ -33,14 +33,14 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Poetry Venv Dir run: | echo "VENV_DIR=$(poetry config virtualenvs.path)" >> $GITHUB_ENV - name: Restore the Cache id: cache-deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.VENV_DIR }} # bump the suffix if you need to force-refresh the cache diff --git a/tests/__init__.py b/tests/__init__.py index ef368dda..2d7ab53a 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,7 @@ import importlib import unittest + class ImportTest(unittest.TestCase): def test_import(self):