Skip to content

Commit 1937d79

Browse files
authored
Merge pull request #58 from mbaldessari/v1-branch
Update v1 branch
2 parents 6105351 + 264aa96 commit 1937d79

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v6
4040
with:
4141
persist-credentials: false
4242

@@ -49,7 +49,7 @@ jobs:
4949
buildah push "${CONTAINER}-${TARGETARCH}" "docker-archive:/tmp/image-${TARGETARCH}.tar:${CONTAINER}-${TARGETARCH}"
5050
5151
- name: Upload image artifact
52-
uses: actions/upload-artifact@v5
52+
uses: actions/upload-artifact@v6
5353
with:
5454
name: image-${{ matrix.targetarch }}-${{ github.run_id }}
5555
path: /tmp/image-${{ matrix.targetarch }}.tar
@@ -75,18 +75,18 @@ jobs:
7575

7676
steps:
7777
- name: Checkout repository
78-
uses: actions/checkout@v5
78+
uses: actions/checkout@v6
7979
with:
8080
persist-credentials: false
8181

8282
- name: Download AMD64 image
83-
uses: actions/download-artifact@v6
83+
uses: actions/download-artifact@v7
8484
with:
8585
name: image-amd64-${{ github.run_id }}
8686
path: /tmp
8787

8888
- name: Download ARM64 image
89-
uses: actions/download-artifact@v6
89+
uses: actions/download-artifact@v7
9090
with:
9191
name: image-arm64-${{ github.run_id }}
9292
path: /tmp

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ TESTCOMMAND := "set -e; echo '* oc: '; oc version ; \
2323
.PHONY: help
2424
help: ## Help
2525
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^(\s|[a-zA-Z_0-9-])+:.*?##/ { printf " \033[36m%-35s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
26+
@echo -e "\nCustom build+upload with: make UPLOADREGISTRY=quay.io/foo TAG=testme build upload\n"
2627

2728
##@ Build-related tasks
2829
.PHONY: build

0 commit comments

Comments
 (0)