Skip to content

Commit 0abea84

Browse files
sdn4zsdn4z
committed
ci: test --version after build
1 parent f1438fb commit 0abea84

File tree

5 files changed

+110
-20
lines changed

5 files changed

+110
-20
lines changed

‎.github/actions/docker-build/action.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
# Action that wraps together all the necessary actions to build an image and publish it.
22
# It does not include login actions.
33
# This is a convenience, so that we know that everything related to the build lies in this file,
4-
# and if it gets updated we can automatically run our `test-docker-build` from `build-test.yml.`
4+
# and if it gets updated we can automatically run our `test-docker-build` from `build-test.yml.`,
5+
# so there is no confusion about which is the job that was updated, if there are many in the same workflow file.
56

67
name: "Docker Build"
78
description: "Builds Docker images with optional caching and multi-platform support"
89

910
inputs:
10-
push-image:
11+
push:
1112
description: "Whether to push the built image"
1213
required: false
1314
default: "false"
15+
load:
16+
description: "Whether to load the built image"
17+
required: false
18+
default: "false"
1419
platforms:
1520
description: "Target platforms for the build"
1621
required: false
@@ -55,9 +60,10 @@ runs:
5560
with:
5661
context: ${{ inputs.context }}
5762
file: ${{ inputs.dockerfile }}
58-
push: ${{ inputs['push-image'] }}
63+
push: ${{ inputs.push }}
5964
platforms: ${{ inputs.platforms }}
6065
tags: ${{ steps.meta.outputs.tags }}
6166
labels: ${{ steps.meta.outputs.labels }}
6267
cache-from: ${{ inputs['cache-from'] }}
6368
cache-to: ${{ inputs['cache-to'] }}
69+
load: ${{ inputs.load }}

‎.github/workflows/build-test.yml‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: ["main"]
88
pull_request:
99
branches: ["main"]
10-
10+
1111
jobs:
1212
test-build-package:
1313
name: Test package build
@@ -34,7 +34,7 @@ jobs:
3434
WHEEL_FILE=$(ls dist/*.whl | head -1)
3535
echo "Installing wheel: $WHEEL_FILE"
3636
uv pip install "$WHEEL_FILE"
37-
37+
3838
- name: Test twyn as a library
3939
run: uv run python -c "import twyn; twyn.check_dependencies"
4040

@@ -73,12 +73,22 @@ jobs:
7373

7474
test-docker-build:
7575
needs: [should-test-docker-build]
76-
name: Test Docker build
76+
name: Test Docker build ${{ matrix.arch }}
7777
runs-on: ubuntu-latest
7878
if: (needs.should-test-docker-build.outputs.workflow == 'true' || needs.should-test-docker-build.outputs.docker == 'true') && !startsWith(github.event.head_commit.message, 'bump:')
7979
permissions:
8080
contents: read
8181
packages: read
82+
strategy:
83+
matrix:
84+
include:
85+
- arch: AMD64
86+
platform: linux/amd64
87+
image-name: build-amd64
88+
- arch: ARM64
89+
platform: linux/arm64
90+
image-name: build-arm64
91+
needs-qemu: true
8292
steps:
8393
- name: Check out the repo
8494
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -90,12 +100,23 @@ jobs:
90100
username: ${{ github.actor }}
91101
password: ${{ secrets.GITHUB_TOKEN }}
92102

103+
- name: Set up QEMU
104+
if: matrix.needs-qemu
105+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
106+
with:
107+
platforms: ${{ matrix.platform }}
108+
93109
- name: Build image
94110
uses: ./.github/actions/docker-build
95111
with:
96112
context: .
97113
file: ./Dockerfile
98114
push: false
99-
platforms: linux/amd64,linux/arm64
100-
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache
101-
115+
load: true
116+
platforms: ${{ matrix.platform }}
117+
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache-${{ matrix.platform }}
118+
image-name: ${{ matrix.image-name }}
119+
120+
- name: Test
121+
run: |
122+
docker run --platform ${{ matrix.platform }} --rm ${{ matrix.image-name }}:pr-${{ github.event.pull_request.number }} --version

‎.github/workflows/publish.yml‎

Lines changed: 71 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,60 @@ jobs:
2727
uv build
2828
uv publish
2929
30-
push_to_docker_hub:
31-
name: Push Docker image to Docker Hub
30+
build_and_test_docker:
31+
name: Build and test Docker image (${{ matrix.arch }})
3232
runs-on: ubuntu-latest
33+
permissions:
34+
contents: read
35+
packages: write
36+
strategy:
37+
matrix:
38+
include:
39+
- arch: AMD64
40+
platform: linux/amd64
41+
cache-ref: buildcache-amd64
42+
test-image: elementsinteractive/twyn:test-amd64
43+
- arch: ARM64
44+
platform: linux/arm64
45+
cache-ref: buildcache-arm64
46+
test-image: elementsinteractive/twyn:test-arm64
47+
needs-qemu: true
48+
steps:
49+
- name: Check out the repo
50+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
51+
52+
- name: Log in to GitHub Container Registry
53+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
54+
with:
55+
registry: ghcr.io
56+
username: ${{ github.actor }}
57+
password: ${{ secrets.GITHUB_TOKEN }}
58+
59+
- name: Set up QEMU
60+
if: matrix.needs-qemu
61+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
62+
with:
63+
platforms: arm64
64+
65+
- name: Build Docker image (${{ matrix.arch }})
66+
uses: ./.github/actions/docker-build
67+
with:
68+
push: "false"
69+
platforms: ${{ matrix.platform }}
70+
dockerfile: ./Dockerfile
71+
context: .
72+
image-name: elementsinteractive/twyn
73+
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:${{ matrix.cache-ref }}
74+
cache-to: type=registry,ref=ghcr.io/elementsinteractive/twyn:${{ matrix.cache-ref }},mode=max,compression=zstd,force-compression=true,oci-mediatypes=true
75+
76+
- name: Test Docker image (${{ matrix.arch }})
77+
run: |
78+
docker run --platform ${{ matrix.platform }} --rm ${{ matrix.test-image }} --version
79+
80+
publish_docker_images:
81+
name: Push Docker images to registries
82+
runs-on: ubuntu-latest
83+
needs: [build_and_test_docker]
3384
permissions:
3485
contents: read
3586
packages: write
@@ -50,16 +101,25 @@ jobs:
50101
username: ${{ github.actor }}
51102
password: ${{ secrets.GITHUB_TOKEN }}
52103

53-
- name: Build and push Docker image
104+
- name: Push Docker image (AMD64)
105+
uses: ./.github/actions/docker-build
106+
with:
107+
push: "true"
108+
platforms: linux/amd64
109+
dockerfile: ./Dockerfile
110+
context: .
111+
image-name: elementsinteractive/twyn
112+
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache-amd64
113+
114+
- name: Push Docker image (ARM64)
54115
uses: ./.github/actions/docker-build
55116
with:
56-
push-image: "true"
57-
platforms: linux/amd64,linux/arm64
117+
push: "true"
118+
platforms: linux/arm64
58119
dockerfile: ./Dockerfile
59120
context: .
60121
image-name: elementsinteractive/twyn
61-
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache
62-
cache-to: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache,mode=max,compression=zstd,force-compression=true,oci-mediatypes=true
122+
cache-from: type=registry,ref=ghcr.io/elementsinteractive/twyn:buildcache-arm64
63123

64124
- name: Delete old cache entries
65125
env:
@@ -68,17 +128,18 @@ jobs:
68128
# Get all versions of the container package
69129
versions=$(gh api "orgs/elementsinteractive/packages/container/twyn/versions" --paginate)
70130
71-
# Extract version IDs that do NOT have the 'buildcache' tag
72-
ids_to_delete=$(echo "$versions" | jq -r '.[] | select(.metadata.container.tags | index("buildcache") | not) | .id')
131+
# Extract version IDs that do NOT have any buildcache-* tags (buildcache-amd64, buildcache-arm64, etc.)
132+
ids_to_delete=$(echo "$versions" | jq -r '.[] | select(.metadata.container.tags | map(test("^buildcache-")) | any | not) | .id')
73133
74134
# Delete them
75135
for id in $ids_to_delete; do
76136
echo "Deleting old cache version ID: $id"
77137
gh api -X DELETE "orgs/elementsinteractive/packages/container/twyn/versions/$id"
78138
done
139+
79140
release_notes:
80141
runs-on: ubuntu-latest
81-
needs: [push_to_pypi, push_to_docker_hub]
142+
needs: [push_to_pypi, publish_docker_images]
82143
steps:
83144
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
84145
- name: Release

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN ${BIN_PATH}/python -m ensurepip
4444
COPY uv.lock pyproject.toml ./
4545

4646
# Install dependencies using uv (only dependencies, not the project itself)
47-
RUN uv sync --inexact --frozen --all-extras --no-install-project --compile-bytecode
47+
RUN uv sync --inexact --frozen --all-extras --no-install-project --compile-bytecode
4848

4949
# --------------- `final` stage ---------------
5050
FROM base AS final

‎pyproject.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ download = [
6262
]
6363
local = ["ipdb<1.0.0,>=0.13.9", "commitizen<5.0,>=2.38", "pdbpp<1.0.0,>=0.11.6"]
6464

65+
[tool.uv]
66+
default-groups = []
6567

6668
[build-system]
6769
requires = ["hatchling"]

0 commit comments

Comments
 (0)