Configured matrix for image publishing, removed clutter

max-pfeiffer · Sep 23, 2023 · f2ef1c6 · f2ef1c6
1 parent b71fac3
commit f2ef1c6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 78 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -44,7 +44,7 @@ jobs:
         poetry_version: ["1.4.2", "1.5.1", "1.6.1"]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v2          
       - name: Setup Python
@@ -91,7 +91,7 @@ jobs:
         poetry_version: ["1.6.1"]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v2          
       - name: Setup Python
@@ -133,9 +133,15 @@ jobs:
       - run-publish-image-tests
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python_version: ["3.9.18", "3.10.13", "3.11.5"]
+        os_variant: ["bookworm", "slim-bookworm"]
+        poetry_version: ["1.4.2", "1.5.1", "1.6.1"]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Expose GitHub Runtime
         uses: crazy-max/ghaction-github-runtime@v2          
       - name: Get Git Commit Tag Name
@@ -159,10 +165,13 @@ jobs:
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: |
           poetry install --no-interaction --no-root
-      - name: Publish Image to Docker Hub
+      - name: Publish Images to Docker Hub
         env:
           DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
           DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          PYTHON_VERSION: ${{ matrix.python_version }}
+          OS_VARIANT: ${{ matrix.os_variant }}
+          POETRY_VERSION: ${{ matrix.poetry_version }}
         run: |
           source .venv/bin/activate
           python -m build.publish
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
diff --git a/tests/publish_image/__init__.py b/tests/publish_image/__init__.py
diff --git a/tests/test.txt b/tests/test.txt
diff --git a/tests/utils.py b/tests/utils.py
@@ -51,34 +51,3 @@ def create_from_reference(cls, tag: str):
             poetry_version=poetry_version,
             python_version=python_version,
         )
-
-
-def create_version_tag_for_example_images(version: str, target: str) -> str:
-    version_tag: str = f"{version}-{target}"
-    return version_tag
-
-
-def extract_image_references_from_build_config(build_config: dict) -> list[str]:
-    image_tags: list[str] = []
-    targets: dict = build_config["target"]
-    for value in targets.values():
-        image_tags.extend(value["tags"])
-    return image_tags
-
-
-def generate_image_references(
-    bake_file: Path, context: Path, version: str
-) -> list[str]:
-    pow_docker_client: DockerClient = DockerClient()
-    build_config: dict = pow_docker_client.buildx.bake(
-        targets=["python-poetry"],
-        files=[bake_file],
-        variables=dict(
-            REGISTRY="localhost:5000",
-            CONTEXT=str(context),
-            IMAGE_VERSION=version,
-        ),
-        print=True,
-    )
-    images_tags = extract_image_references_from_build_config(build_config)
-    return images_tags