Merge pull request 'dev-v0.7.x' (#16) from dev-v0.7.x into main
Some checks failed
Build and Publish Docker Image (Semantic Cache) / build (amd64, linux/amd64, docker-amd64) (push) Failing after 3m34s
Build and Publish Docker Image / build (amd64, linux/amd64, docker-amd64) (push) Successful in 1m30s
Build and Publish Docker Image (Semantic Cache) / build (arm64, linux/arm64, docker-arm64) (push) Successful in 14m44s
Build and Publish Docker Image (Semantic Cache) / merge (push) Has been skipped
Build and Publish Docker Image / build (arm64, linux/arm64, docker-arm64) (push) Successful in 11m59s
Build and Publish Docker Image / merge (push) Failing after 29s

Reviewed-on: https://bitfreedom.net/code/code/nomyo-ai/nomyo-router/pulls/16
This commit is contained in:
Alpha Nerd 2026-04-05 18:08:31 +02:00
commit 23f66b7c0e
2 changed files with 16 additions and 10 deletions

View file

@ -18,6 +18,7 @@ on:
env: env:
REGISTRY: bitfreedom.net REGISTRY: bitfreedom.net
IMAGE_NAME: ${{ github.repository }} IMAGE_NAME: ${{ github.repository }}
CACHE_IMAGE: ${{ github.repository }}-buildcache
jobs: jobs:
build: build:
@ -34,8 +35,10 @@ jobs:
include: include:
- platform: linux/amd64 - platform: linux/amd64
runner: docker-amd64 runner: docker-amd64
arch: amd64
- platform: linux/arm64 - platform: linux/arm64
runner: docker-arm64 runner: docker-arm64
arch: arm64
steps: steps:
- name: Install Docker - name: Install Docker
@ -83,9 +86,9 @@ jobs:
provenance: false provenance: false
build-args: | build-args: |
SEMANTIC_CACHE=true SEMANTIC_CACHE=true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-semantic-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} tags: ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:platform-semantic-${{ matrix.arch }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-semantic-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:buildcache-semantic-${{ matrix.arch }}
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-semantic-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }},mode=max cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:buildcache-semantic-${{ matrix.arch }},mode=min,image-manifest=true,oci-mediatypes=true
merge: merge:
runs-on: docker-amd64 runs-on: docker-amd64
@ -139,5 +142,5 @@ jobs:
run: | run: |
docker buildx imagetools create \ docker buildx imagetools create \
$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-semantic-amd64 \ ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:run-${{ github.run_id }}-semantic-amd64 \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-semantic-arm64 ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:run-${{ github.run_id }}-semantic-arm64

View file

@ -11,6 +11,7 @@ on:
env: env:
REGISTRY: bitfreedom.net REGISTRY: bitfreedom.net
IMAGE_NAME: ${{ github.repository }} IMAGE_NAME: ${{ github.repository }}
CACHE_IMAGE: ${{ github.repository }}-buildcache
jobs: jobs:
build: build:
@ -27,8 +28,10 @@ jobs:
include: include:
- platform: linux/amd64 - platform: linux/amd64
runner: docker-amd64 runner: docker-amd64
arch: amd64
- platform: linux/arm64 - platform: linux/arm64
runner: docker-arm64 runner: docker-arm64
arch: arm64
steps: steps:
- name: Install Docker - name: Install Docker
@ -74,9 +77,9 @@ jobs:
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
push: true push: true
provenance: false provenance: false
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} tags: ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:platform-${{ matrix.arch }}
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:buildcache-${{ matrix.arch }}
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }},mode=max cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:buildcache-${{ matrix.arch }},mode=min,image-manifest=true,oci-mediatypes=true
merge: merge:
runs-on: docker-amd64 runs-on: docker-amd64
@ -130,5 +133,5 @@ jobs:
run: | run: |
docker buildx imagetools create \ docker buildx imagetools create \
$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-amd64 \ ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:run-${{ github.run_id }}-amd64 \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache-arm64 ${{ env.REGISTRY }}/${{ env.CACHE_IMAGE }}:run-${{ github.run_id }}-arm64