Skip to content

Commit

Permalink
fix: do plain push from the main release action (#532)
Browse files Browse the repository at this point in the history
## Description

<!-- 
Please do not leave this blank 
This PR [adds/removes/fixes/replaces] the [feature/bug/etc]. 
-->

Please include a summary of the changes and the related issue. Please
also include relevant motivation and context. List any dependencies that
are required for this change.


## What type of PR is this? (check all applicable)

- [ ] 🍕 Feature
- [ ] 🐛 Bug Fix
- [ ] 📝 Documentation Update
- [ ] 🎨 Style
- [ ] 🧑‍💻 Code Refactor
- [ ] 🔥 Performance Improvements
- [ ] ✅ Test
- [ ] 🤖 Build
- [ ] 🔁 CI
- [ ] 📦 Chore (Release)
- [ ] ⏩ Revert

## Related Tickets & Documents

<!-- 
Please use this format link issue numbers: Fixes #123

https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
-->
- Related Issue # (issue)
- Closes # (issue)
- Fixes # (issue)
> Remove if not applicable

## Screenshots

<!-- Visual changes require screenshots -->


## Added tests?

- [ ] 👍 yes
- [ ] 🙅 no, because they aren't needed
- [ ] 🙋 no, because I need help
- [ ] Separate ticket for tests # (issue/pr)

Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration


## Added to documentation?

- [ ] 📜 README.md
- [ ] 🙅 no documentation needed

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
  • Loading branch information
Skarlso authored Oct 4, 2024
1 parent 97c3983 commit 8f84323
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
- name: CTF
run: |
cd component/
PATH=$PATH:$(go env GOPATH)/bin make ocm && make ctf
PATH=$PATH:$(go env GOPATH)/bin make ocm && make ctf
43 changes: 0 additions & 43 deletions .github/workflows/components_push.yaml

This file was deleted.

14 changes: 5 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ jobs:
permissions:
contents: read
pull-requests: 'read'
components:
name: Component CTF Builds
uses: ./.github/workflows/components_push.yaml
permissions:
contents: write
pull-requests: read
packages: write
with:
token: ${{ secrets.GITHUB_TOKEN }}
release:
needs: tests
name: Trigger release build
Expand Down Expand Up @@ -123,3 +114,8 @@ jobs:
helm registry login ghcr.io -u open-component-model -p ${{ secrets.GITHUB_TOKEN }}
helm package --version ${{ env.RELEASE_VERSION }} --app-version ${{ env.RELEASE_VERSION }} ./deploy
helm push ${{ github.event.repository.name }}-${{ env.RELEASE_VERSION }}.tgz oci://ghcr.io/open-component-model/helm
- name: Push OCM Components
env:
GITHUBORG: ${{ github.repository_owner }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: make plain-push
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ PLATFORM_ARCH := $(shell go env GOARCH)
GOTESTSUM ?= $(LOCALBIN)/gotestsum
MKCERT ?= $(LOCALBIN)/mkcert
UNAME ?= $(shell uname|tr '[:upper:]' '[:lower:]')
GEN := $(REPO_ROOT)/gen

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -161,6 +162,13 @@ dev-deploy: kustomize ## Deploy controller dev image in the configured Kubernete
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -

##@ Component

.PHONY: plain-push
plain-push:
$(MAKE) -C component ctf
$(OCM) transfer ctf -f $(GEN)/component/ctf $(OCMREPO)

##@ Documentation

api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
Expand Down
3 changes: 3 additions & 0 deletions docs/release_notes/v0.24.12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Release 0.24.12

- fix: do plain push from the main release action
2 changes: 1 addition & 1 deletion pkg/version/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package version

// ReleaseVersion is the version number in semver format "vX.Y.Z", prefixed with "v".
var ReleaseVersion = "v0.24.10"
var ReleaseVersion = "v0.24.12"

// ReleaseCandidate is the release candidate ID in format "rc.X", which will be appended to the release version.
var ReleaseCandidate = "rc.1"

0 comments on commit 8f84323

Please sign in to comment.