From 09a49a14b727bdb8553d5f0a58582cdfa2f8b932 Mon Sep 17 00:00:00 2001 From: Frederic Wilhelm Date: Fri, 29 May 2026 09:21:08 +0200 Subject: [PATCH 1/2] use github environment Signed-off-by: Frederic Wilhelm --- .github/workflows/flake_vendorhash.yaml | 3 +++ .github/workflows/publish-latest.yaml | 6 ++++++ .github/workflows/publish-to-other-than-github.yaml | 12 ++++++++++++ .github/workflows/release-branch.yaml | 6 ++++++ .github/workflows/release-bump-version.yaml | 3 +++ .github/workflows/release-drafter.yaml | 3 +++ .github/workflows/release.yaml | 6 ++++++ .github/workflows/retrigger-publish-to-other.yaml | 3 +++ 8 files changed, 42 insertions(+) diff --git a/.github/workflows/flake_vendorhash.yaml b/.github/workflows/flake_vendorhash.yaml index eb44f05d9..35705a00d 100644 --- a/.github/workflows/flake_vendorhash.yaml +++ b/.github/workflows/flake_vendorhash.yaml @@ -11,6 +11,9 @@ on: jobs: updateVendorHash: runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: id-token: write contents: write diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index a882b4bfe..e565f11c8 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -16,6 +16,9 @@ jobs: docker_publish: runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: contents: write id-token: write @@ -72,6 +75,9 @@ jobs: ocm-cli-latest: name: Build latest ocm-cli runs-on: large_runner + environment: + name: release + deployment: false permissions: contents: write id-token: write diff --git a/.github/workflows/publish-to-other-than-github.yaml b/.github/workflows/publish-to-other-than-github.yaml index 7dbfbb9f9..b4c006366 100644 --- a/.github/workflows/publish-to-other-than-github.yaml +++ b/.github/workflows/publish-to-other-than-github.yaml @@ -19,6 +19,9 @@ jobs: name: Update Homebrew Tap if: github.event.client_payload.push-to-brew-tap && github.event.client_payload.version != '' runs-on: ubuntu-latest + environment: + name: release + deployment: false env: REPO: open-component-model/homebrew-tap steps: @@ -80,6 +83,9 @@ jobs: name: Update Arch Linux User Repository if: github.event.client_payload.push-to-aur && github.event.client_payload.version != '' runs-on: ubuntu-latest + environment: + name: release + deployment: false steps: - name: Ensure proper version run: echo "RELEASE_VERSION=$(echo ${{ github.event.client_payload.version }} | tr -d ['v'])" >> $GITHUB_ENV @@ -105,6 +111,9 @@ jobs: name: Update Chocolatey if: github.event.client_payload.push-to-chocolatey && github.event.client_payload.version != '' runs-on: windows-latest + environment: + name: release + deployment: false steps: - name: Ensure proper version run: | @@ -128,6 +137,9 @@ jobs: push-to-website: name: Update OCM Website runs-on: ubuntu-latest + environment: + name: release + deployment: false if: github.event.client_payload.push-to-website && github.event.client_payload.version != '' steps: - name: Ensure proper version diff --git a/.github/workflows/release-branch.yaml b/.github/workflows/release-branch.yaml index 4492a558f..f09f2e5b4 100644 --- a/.github/workflows/release-branch.yaml +++ b/.github/workflows/release-branch.yaml @@ -15,6 +15,9 @@ permissions: jobs: cutoff-preconditions: runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: contents: read id-token: write @@ -63,6 +66,9 @@ jobs: create-branch: runs-on: ubuntu-latest needs: cutoff-preconditions + environment: + name: release + deployment: false permissions: contents: write id-token: write diff --git a/.github/workflows/release-bump-version.yaml b/.github/workflows/release-bump-version.yaml index d8a985e46..92b703368 100644 --- a/.github/workflows/release-bump-version.yaml +++ b/.github/workflows/release-bump-version.yaml @@ -18,6 +18,9 @@ jobs: create-bump-pr: name: "Pull Request" runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: contents: write id-token: write diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index ee0564d7a..12447e8fb 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -28,6 +28,9 @@ jobs: permissions: contents: write runs-on: ubuntu-latest + environment: + name: release + deployment: false env: RELEASE_VERSION: ${{ needs.release-version.outputs.version }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3d40ab0a3..e2b32a11e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,6 +27,9 @@ jobs: check: name: Check Release Preconditions runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: contents: read repository-projects: read @@ -103,6 +106,9 @@ jobs: - components name: Release Build runs-on: large_runner + environment: + name: release + deployment: false permissions: contents: write id-token: write diff --git a/.github/workflows/retrigger-publish-to-other.yaml b/.github/workflows/retrigger-publish-to-other.yaml index 201d0ae3e..f8855ea4a 100644 --- a/.github/workflows/retrigger-publish-to-other.yaml +++ b/.github/workflows/retrigger-publish-to-other.yaml @@ -33,6 +33,9 @@ jobs: retrigger: name: Create new "Release Publish Event" runs-on: ubuntu-latest + environment: + name: release + deployment: false permissions: contents: write id-token: write From 191892a4e7eb937a9129759238f17fd1215c374c Mon Sep 17 00:00:00 2001 From: Frederic Wilhelm Date: Fri, 29 May 2026 14:12:59 +0200 Subject: [PATCH 2/2] pin ocmcli v2 to a compatible version Signed-off-by: Frederic Wilhelm --- .../ocicmds/artifacts/transfer/index_transfer_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmds/ocm/commands/ocicmds/artifacts/transfer/index_transfer_test.go b/cmds/ocm/commands/ocicmds/artifacts/transfer/index_transfer_test.go index c8664f2bd..6e266faa0 100644 --- a/cmds/ocm/commands/ocicmds/artifacts/transfer/index_transfer_test.go +++ b/cmds/ocm/commands/ocicmds/artifacts/transfer/index_transfer_test.go @@ -115,8 +115,8 @@ var _ = Describe("Index Transfer", func() { ) By("pulling the OCI index image from GHCR and pushing it to the local registry") - srcRef := "ghcr.io/open-component-model/cli:main" - dstRef := fmt.Sprintf("%s/ocm-cli:main", registryAddress) + srcRef := "ghcr.io/open-component-model/cli:0.2.0" + dstRef := fmt.Sprintf("%s/ocm-cli:0.2.0", registryAddress) repoSrc, err := remote.NewRepository(srcRef) r.NoError(err) @@ -203,7 +203,7 @@ configurations: "run", "--rm", "--network", "host", "-v", fmt.Sprintf("%s:/work", tempDir), - "ghcr.io/open-component-model/cli:main", + "ghcr.io/open-component-model/cli:0.2.0", "add", "component-version", "--repository", "http://" + registryAddress, "--config", "/work/ocmconfig.yaml", @@ -220,7 +220,7 @@ configurations: "run", "--rm", "--network", "host", "-v", fmt.Sprintf("%s:/work", tempDir), - "ghcr.io/open-component-model/cli:main", + "ghcr.io/open-component-model/cli:0.2.0", "get", "component-version", "--config", "/work/ocmconfig.yaml", "-oyaml",