From bacea6e6a4b9b9aea78a02328da8ce88010908d5 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Thu, 19 Dec 2024 12:07:41 +0100 Subject: [PATCH 1/6] codespell --- .github/workflows/lint_and_test.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index 20bfddb4a1..fea754026f 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -111,3 +111,10 @@ jobs: run: go install golang.org/x/tools/cmd/goimports@latest - name: Lint run: make check + + codespell: # call reusable workflow from central '.github' repo + uses: open-component-model/.github/.github/workflows/codespell.yml@main + secrets: inherit + with: + codespell-ignore: .github/config/wordlist.txt + codespell-files-glob: ./**/*.y*ml ./**/*.go From 4494069bc48637a507a498aa021c983428a81a84 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 Jan 2025 13:52:54 +0100 Subject: [PATCH 2/6] Update publish-latest.yaml --- .github/workflows/publish-latest.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index 9d60f1dd52..f067406b83 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -61,13 +61,12 @@ jobs: with: context: . # supported platforms of https://hub.docker.com/_/golang/tags?page=1&name=1.23-alpine3.20 - # platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + platforms: + - linux/amd64 + - darwin push: true tags: | - ghcr.io/open-component-model/ocm:latest - ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:latest - ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + ghcr.io/hilmarf/ocm/ocm.software/ocmcli/ocmcli-image:latest ocm-cli-latest: name: Build latest ocm-cli @@ -166,4 +165,4 @@ jobs: key: ${{ env.cache_name }}-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}-${{ hashFiles('**/go.mod') }} upload-chunk-size: 256000000 # default of 32MB is not really optimal for our large cache, choose 256MB instead env: - cache_name: ocm-cli-latest-go-cache # needs to be the same key in the end as in the build step \ No newline at end of file + cache_name: ocm-cli-latest-go-cache # needs to be the same key in the end as in the build step From 4b3b50202ebd017b56c3826e699d502b0a567f58 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 Jan 2025 13:54:34 +0100 Subject: [PATCH 3/6] Update publish-latest.yaml --- .github/workflows/publish-latest.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index f067406b83..067e4f2453 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -2,6 +2,7 @@ name: publish as latest on: # publish on pushes to the main branch (image tagged as "latest") # https://ocm.software/ocm/pkgs/container/ocm + workflow_dispatch: push: branches: - main From f1bc6a92274532c416b0a18faa99321e193104fd Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 Jan 2025 13:55:22 +0100 Subject: [PATCH 4/6] Update publish-latest.yaml --- .github/workflows/publish-latest.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index 067e4f2453..038e1a0ae1 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -62,9 +62,7 @@ jobs: with: context: . # supported platforms of https://hub.docker.com/_/golang/tags?page=1&name=1.23-alpine3.20 - platforms: - - linux/amd64 - - darwin + platforms: linux/amd64,darwin push: true tags: | ghcr.io/hilmarf/ocm/ocm.software/ocmcli/ocmcli-image:latest From c844c5d7862c90329d9505369b8a9fd5492a1541 Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Mon, 6 Jan 2025 14:11:20 +0100 Subject: [PATCH 5/6] Update publish-latest.yaml --- .github/workflows/publish-latest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index 038e1a0ae1..cfd6de2de5 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -62,7 +62,7 @@ jobs: with: context: . # supported platforms of https://hub.docker.com/_/golang/tags?page=1&name=1.23-alpine3.20 - platforms: linux/amd64,darwin + platforms: linux/amd64,linux/arm64 push: true tags: | ghcr.io/hilmarf/ocm/ocm.software/ocmcli/ocmcli-image:latest From 84c197d23689fff69bb9c4a5bdcd4617c537827f Mon Sep 17 00:00:00 2001 From: Hilmar Falkenberg Date: Tue, 7 Jan 2025 11:30:06 +0100 Subject: [PATCH 6/6] revert --- .github/workflows/publish-latest.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index cfd6de2de5..9736db31cf 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -2,7 +2,6 @@ name: publish as latest on: # publish on pushes to the main branch (image tagged as "latest") # https://ocm.software/ocm/pkgs/container/ocm - workflow_dispatch: push: branches: - main @@ -61,11 +60,14 @@ jobs: uses: docker/build-push-action@v6 with: context: . - # supported platforms of https://hub.docker.com/_/golang/tags?page=1&name=1.23-alpine3.20 - platforms: linux/amd64,linux/arm64 + # supported platforms: https://github.com/GoogleContainerTools/distroless?tab=readme-ov-file#what-images-are-available + platforms: linux/amd64,linux/arm64 #linux/arm,linux/ppc64le,linux/s390x push: true tags: | - ghcr.io/hilmarf/ocm/ocm.software/ocmcli/ocmcli-image:latest + ghcr.io/open-component-model/ocm:latest + ghcr.io/open-component-model/ocm/ocm.software/ocmcli/ocmcli-image:latest + ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} ocm-cli-latest: name: Build latest ocm-cli