Skip to content

Commit 71753fc

Browse files
authored
Merge pull request #29 from devilbox/release-0.1.41
Use artifact-upload wrapper
2 parents 0e995d4 + 22928f8 commit 71753fc

File tree

1 file changed

+29
-30
lines changed

1 file changed

+29
-30
lines changed

.github/workflows/docker-multistage-build.yml

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -137,41 +137,40 @@ jobs:
137137
###
138138
### Export current image
139139
###
140-
- name: "[Artifact Save] Export currently built image"
141-
uses: cytopia/shell-command-retry-action@v0.1.3
140+
- name: "[Artifact Save] (try-1)"
141+
id: upload-1
142+
uses: cytopia/upload-artifact-verify-action@v0.1.3
143+
continue-on-error: true
142144
with:
143-
command: |
145+
name: ${{ steps.set-artifact-name.outputs.curr }}
146+
path: ${{ steps.set-artifact-name.outputs.curr }}
147+
pre_command: |
144148
make save-verify VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} OUTFILE=${{ steps.set-artifact-name.outputs.curr }} INFILE=${{ steps.set-artifact-name.outputs.curr }}
149+
post_command: |
150+
make load INFILE={{download_path}}
145151
if: ${{ inputs.upload_artifact }}
146152

147-
###
148-
### Upload current image
149-
###
150-
- name: "[Artifact Save] Upload currently built image"
151-
uses: Wandalen/wretry.action@v1.0.12
152-
with:
153-
action: actions/upload-artifact@v2
154-
with: |
155-
name: ${{ steps.set-artifact-name.outputs.curr }}
156-
path: ${{ steps.set-artifact-name.outputs.curr }}
157-
if-no-files-found: error
158-
attempt_limit: 20
159-
attempt_delay: 10000
160-
if: ${{ inputs.upload_artifact }}
161-
162-
###
163-
### Verify uploaded image
164-
###
165-
- name: "[Artifact Save] Download (verify)"
166-
uses: actions/download-artifact@v2
153+
- name: "[Artifact Save] (try-2)"
154+
id: upload-2
155+
uses: cytopia/upload-artifact-verify-action@v0.1.3
156+
continue-on-error: true
167157
with:
168158
name: ${{ steps.set-artifact-name.outputs.curr }}
169-
path: ${{ steps.set-artifact-name.outputs.curr }}.tmp
170-
if: ${{ inputs.upload_artifact }}
159+
path: ${{ steps.set-artifact-name.outputs.curr }}
160+
pre_command: |
161+
make save-verify VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} OUTFILE=${{ steps.set-artifact-name.outputs.curr }} INFILE=${{ steps.set-artifact-name.outputs.curr }}
162+
post_command: |
163+
make load INFILE={{download_path}}
164+
if: ${{ inputs.upload_artifact && steps.upload-1.outcome == 'failure' }}
171165

172-
- name: "[Artifact Save] Import (verify)"
173-
uses: cytopia/shell-command-retry-action@v0.1.3
166+
- name: "[Artifact Save] (try-3)"
167+
id: upload-3
168+
uses: cytopia/upload-artifact-verify-action@v0.1.3
174169
with:
175-
command: |
176-
make load INFILE=${{ steps.set-artifact-name.outputs.curr }}.tmp/${{ steps.set-artifact-name.outputs.curr }}
177-
if: ${{ inputs.upload_artifact }}
170+
name: ${{ steps.set-artifact-name.outputs.curr }}
171+
path: ${{ steps.set-artifact-name.outputs.curr }}
172+
pre_command: |
173+
make save-verify VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} OUTFILE=${{ steps.set-artifact-name.outputs.curr }} INFILE=${{ steps.set-artifact-name.outputs.curr }}
174+
post_command: |
175+
make load INFILE={{download_path}}
176+
if: ${{ inputs.upload_artifact && steps.upload-2.outcome == 'failure' }}

0 commit comments

Comments
 (0)