Skip to content

Commit 6bef235

Browse files
committed
fix: artificat names in v4 must be unique
1 parent ed60397 commit 6bef235

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.dockerignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,11 @@ venv/
8787
# VS Code
8888
.vscode/
8989

90+
# GitHub
91+
.github/
92+
9093
# Documents
9194
README.md
9295
Screenshots/
9396
Banner.png
94-
Logo.png
97+
Logo.png

.github/workflows/ci.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
platform:
16-
- linux/amd64
17-
- linux/arm64
16+
- os: linux
17+
arch: amd64
18+
- os: linux
19+
arch: arm64
1820

1921
runs-on: ubuntu-latest
2022

@@ -46,7 +48,7 @@ jobs:
4648
with:
4749
context: .
4850
labels: ${{ steps.meta.outputs.labels }}
49-
platforms: ${{ matrix.platform }}
51+
platforms: ${{ matrix.platform.os }}/${{ matrix.platform.arch }}
5052
outputs: type=image,name=ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }},push-by-digest=true,name-canonical=true,push=true
5153
cache-from: type=gha
5254
cache-to: type=gha,mode=max
@@ -58,7 +60,7 @@ jobs:
5860
- name: Upload digest
5961
uses: actions/upload-artifact@v4
6062
with:
61-
name: digests
63+
name: digests-${{ matrix.platform.os }}-${{ matrix.platform.arch }}
6264
path: /tmp/digests/*
6365
if-no-files-found: error
6466
retention-days: 1
@@ -75,7 +77,6 @@ jobs:
7577
- name: Download digests
7678
uses: actions/download-artifact@v4
7779
with:
78-
name: digests
7980
path: /tmp/digests
8081
- name: Set up Docker Buildx
8182
uses: docker/setup-buildx-action@v3
@@ -102,7 +103,7 @@ jobs:
102103
working-directory: /tmp/digests
103104
run: |
104105
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
105-
$(printf 'ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}@sha256:%s ' *)
106+
$(find -maxdepth 2 -mindepth 2 -type f -printf "ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}@sha256:%f ")
106107
- name: Inspect image
107108
run: |
108109
docker buildx imagetools inspect ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ steps.meta.outputs.version }}

.github/workflows/test.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
strategy:
1414
matrix:
1515
platform:
16-
- linux/amd64
17-
- linux/arm64
16+
- os: linux
17+
arch: amd64
18+
- os: linux
19+
arch: arm64
1820

1921
runs-on: ubuntu-latest
2022

@@ -30,7 +32,7 @@ jobs:
3032
context: .
3133
push: false
3234
load: true
33-
tags: telegramus-test-${{ matrix.platform }}
34-
platforms: ${{ matrix.platform }}
35+
tags: telegramus-test-${{ matrix.platform.os }}-${{ matrix.platform.arch}}
36+
platforms: ${{ matrix.platform.os }}/${{ matrix.platform.arch}}
3537
- run: |
36-
docker run --rm "telegramus-test-${{ matrix.platform }}" /app/telegramus --version
38+
docker run --rm "telegramus-test-${{ matrix.platform.os }}-${{ matrix.platform.arch}}" /app/telegramus --version

0 commit comments

Comments
 (0)