Skip to content

Commit 8b304f7

Browse files
noaccOSnoaccOS
authored
ci: Fix image publishing (astarte-platform#1814)
- use correct registry image when merging platform images - deduplicate artifact names Signed-off-by: Francesco Noacco <francesco.noacco@secomind.com>
1 parent 2a628f2 commit 8b304f7

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎.github/workflows/publish-release-to-dockerhub-workflow.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ jobs:
104104

105105
- name: Export digest
106106
run: |
107-
mkdir -p ${{ runner.temp }}/digests/${{ matrix.app }}
107+
mkdir -p ${{ runner.temp }}/digests/
108108
digest="${{ steps.build.outputs.digest }}"
109-
touch "${{ runner.temp }}/digests/${{ matrix.app }}/${digest#sha256:}"
109+
touch "${{ runner.temp }}/digests/${digest#sha256:}"
110110
111111
- name: Upload digest
112112
uses: actions/upload-artifact@v4
113113
with:
114-
name: digests-${{ matrix.platform.platform-pair }}
115-
path: ${{ runner.temp }}/digests/${{ matrix.app }}/*
114+
name: ${{ matrix.app }}-digests-${{ matrix.platform.platform-pair }}
115+
path: ${{ runner.temp }}/digests/*
116116
if-no-files-found: error
117117
retention-days: 1
118118

@@ -135,8 +135,8 @@ jobs:
135135
- name: Download digests
136136
uses: actions/download-artifact@v4
137137
with:
138-
path: ${{ runner.temp }}/digests/${{ matrix.app }}
139-
pattern: digests-*
138+
path: ${{ runner.temp }}/digests
139+
pattern: ${{ matrix.app }}-digests-*
140140
merge-multiple: true
141141

142142
- name: Login to Docker Hub
@@ -158,7 +158,7 @@ jobs:
158158
type=semver,pattern={{version}}
159159
160160
- name: Create manifest list and push
161-
working-directory: ${{ runner.temp }}/digests/${{ matrix.app }}
161+
working-directory: ${{ runner.temp }}/digests/
162162
run: |
163163
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
164-
$(printf '${{ matrix.app }}@sha256:%s ' *)
164+
$(printf 'astarte/${{ matrix.app }}@sha256:%s ' *)

‎.github/workflows/publish-snapshot-to-dockerhub-workflow.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ jobs:
121121

122122
- name: Export digest
123123
run: |
124-
mkdir -p ${{ runner.temp }}/digests/${{ matrix.app }}
124+
mkdir -p ${{ runner.temp }}/digests/
125125
digest="${{ steps.build.outputs.digest }}"
126-
touch "${{ runner.temp }}/digests/${{ matrix.app }}/${digest#sha256:}"
126+
touch "${{ runner.temp }}/digests/${digest#sha256:}"
127127
128128
- name: Upload digest
129129
uses: actions/upload-artifact@v4
130130
with:
131-
name: digests-${{ matrix.platform.platform-pair }}
132-
path: ${{ runner.temp }}/digests/${{ matrix.app }}/*
131+
name: ${{ matrix.app }}-digests-${{ matrix.platform.platform-pair }}
132+
path: ${{ runner.temp }}/digests/*
133133
if-no-files-found: error
134134
retention-days: 1
135135

@@ -152,8 +152,8 @@ jobs:
152152
- name: Download digests
153153
uses: actions/download-artifact@v4
154154
with:
155-
path: ${{ runner.temp }}/digests/${{ matrix.app }}
156-
pattern: digests-*
155+
path: ${{ runner.temp }}/digests/
156+
pattern: ${{ matrix.app }}-digests-*
157157
merge-multiple: true
158158

159159
- name: Get current datetime
@@ -191,7 +191,7 @@ jobs:
191191
org.opencontainers.image.source=https://github.com/${{ github.repository }}
192192
193193
- name: Create manifest list and push
194-
working-directory: ${{ runner.temp }}/digests/${{ matrix.app }}
194+
working-directory: ${{ runner.temp }}/digests/
195195
run: |
196196
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
197-
$(printf '${{ matrix.app }}@sha256:%s ' *)
197+
$(printf 'astarte/${{ matrix.app }}@sha256:%s ' *)

‎.github/workflows/publish-tool-release-to-dockerhub-workflow.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ jobs:
6464

6565
- name: Export digest
6666
run: |
67-
mkdir -p ${{ runner.temp }}/digests/${{ matrix.app.tool }}
67+
mkdir -p ${{ runner.temp }}/digests/
6868
digest="${{ steps.build.outputs.digest }}"
69-
touch "${{ runner.temp }}/digests/${{ matrix.app.tool }}/${digest#sha256:}"
69+
touch "${{ runner.temp }}/digests/${digest#sha256:}"
7070
7171
- name: Upload digest
7272
uses: actions/upload-artifact@v4
7373
with:
74-
name: digests-${{ matrix.platform.platform-pair }}
75-
path: ${{ runner.temp }}/digests/${{ matrix.app.tool }}/*
74+
name: ${{ matrix.app.tool }}-digests-${{ matrix.platform.platform-pair }}
75+
path: ${{ runner.temp }}/digests/*
7676
if-no-files-found: error
7777
retention-days: 1
7878

@@ -93,8 +93,8 @@ jobs:
9393
- name: Download digests
9494
uses: actions/download-artifact@v4
9595
with:
96-
path: ${{ runner.temp }}/digests/${{ matrix.app }}
97-
pattern: digests-*
96+
path: ${{ runner.temp }}/digests/
97+
pattern: ${{ matrix.app }}-digests-*
9898
merge-multiple: true
9999

100100
- name: Login to Docker Hub
@@ -116,7 +116,7 @@ jobs:
116116
type=semver,pattern={{version}}
117117
118118
- name: Create manifest list and push
119-
working-directory: ${{ runner.temp }}/digests/${{ matrix.app }}
119+
working-directory: ${{ runner.temp }}/digests/
120120
run: |
121121
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
122-
$(printf '${{ matrix.app }}@sha256:%s ' *)
122+
$(printf 'astarte/${{ matrix.app }}@sha256:%s ' *)

‎.github/workflows/publish-tool-snapshot-to-dockerhub-workflow.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ jobs:
7979

8080
- name: Export digest
8181
run: |
82-
mkdir -p ${{ runner.temp }}/digests/${{ matrix.app.tool }}
82+
mkdir -p ${{ runner.temp }}/digests/
8383
digest="${{ steps.build.outputs.digest }}"
84-
touch "${{ runner.temp }}/digests/${{ matrix.app.tool }}/${digest#sha256:}"
84+
touch "${{ runner.temp }}/digests/${digest#sha256:}"
8585
8686
- name: Upload digest
8787
uses: actions/upload-artifact@v4
8888
with:
89-
name: digests-${{ matrix.platform.platform-pair }}
90-
path: ${{ runner.temp }}/digests/${{ matrix.app.tool }}/*
89+
name: ${{ matrix.app.tool }}-digests-${{ matrix.platform.platform-pair }}
90+
path: ${{ runner.temp }}/digests/*
9191
if-no-files-found: error
9292
retention-days: 1
9393

@@ -112,8 +112,8 @@ jobs:
112112
- name: Download digests
113113
uses: actions/download-artifact@v4
114114
with:
115-
path: ${{ runner.temp }}/digests/${{ matrix.app }}
116-
pattern: digests-*
115+
path: ${{ runner.temp }}/digests/
116+
pattern: ${{ matrix.app }}-digests-*
117117
merge-multiple: true
118118

119119
- name: Get current datetime
@@ -147,7 +147,7 @@ jobs:
147147
type=raw,value=${{ steps.compute-tag.outputs.TAG }}
148148
149149
- name: Create manifest list and push
150-
working-directory: ${{ runner.temp }}/digests/${{ matrix.app }}
150+
working-directory: ${{ runner.temp }}/digests
151151
run: |
152152
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
153-
$(printf '${{ matrix.app }}@sha256:%s ' *)
153+
$(printf 'astarte/${{ matrix.app }}@sha256:%s ' *)

0 commit comments

Comments
 (0)