Skip to content

Commit

Permalink
Update versions in GitHub workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-bass committed Dec 4, 2024
1 parent 636946e commit 3d011c9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ 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:
username: ${{ github.actor }}
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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/push_poetry_container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/update-poetry-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@ 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:
username: ${{ github.actor }}
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
Expand Down
1 change: 1 addition & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import importlib
import unittest


class ImportTest(unittest.TestCase):

def test_import(self):
Expand Down

0 comments on commit 3d011c9

Please sign in to comment.