From eccaec6fcb72097f3ed52996979c6e824bcdd3ee Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 15 May 2025 09:18:10 +0200 Subject: [PATCH 1/2] Additional actions fixes --- .github/workflows/license-check.yaml | 2 +- .github/workflows/publish.yaml | 2 +- .github/workflows/release.yaml | 3 ++- .github/workflows/reuse-scan.yaml | 2 +- .github/workflows/reviewable.yaml | 5 +++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/license-check.yaml b/.github/workflows/license-check.yaml index fd4dffc..5ac0da7 100644 --- a/.github/workflows/license-check.yaml +++ b/.github/workflows/license-check.yaml @@ -1,6 +1,7 @@ name: Check Go Dependency Licenses on: + pull_request: workflow_call: {} push: tags: @@ -10,7 +11,6 @@ on: paths: - go.mod - go.sum - pull_request: permissions: contents: read diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0034984..d843e9a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -75,7 +75,7 @@ jobs: - name: Build Images run: | - IMAGE_REGISTRY=ghcr.io/sap/metrics-operator make docker-build + IMG=ghcr.io/sap/metrics-operator:${{ env.version }} make docker-build - name: setup OCM uses: open-component-model/ocm-setup-action@main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 880e40d..699defe 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -116,8 +116,9 @@ jobs: if: ${{ env.SKIP != 'true' }} run: | echo "${{ env.version }}-dev" > VERSION + make helm-chart git config user.name "${{ env.AUTHOR_NAME }}" git config user.email "${{ env.AUTHOR_EMAIL }}" - git add VERSION + git add VERSION charts/metrics-operator/Chart.yaml charts/metrics-operator/values.yaml git commit -m "Update VERSION to ${{ env.version }}-dev" git push origin main diff --git a/.github/workflows/reuse-scan.yaml b/.github/workflows/reuse-scan.yaml index f08a6a6..195930d 100644 --- a/.github/workflows/reuse-scan.yaml +++ b/.github/workflows/reuse-scan.yaml @@ -3,11 +3,11 @@ name: REUSE Compliance Check on: + pull_request: workflow_call: {} push: branches: - main - pull_request: jobs: diff --git a/.github/workflows/reviewable.yaml b/.github/workflows/reviewable.yaml index 89bba6f..c1c4587 100644 --- a/.github/workflows/reviewable.yaml +++ b/.github/workflows/reviewable.yaml @@ -3,13 +3,14 @@ name: make reviewable && make check-Diff on: + pull_request: workflow_call: {} push: tags: - v* branches: - main - pull_request: + env: GO_IMPORT_VERSION: 'v0.16.1' @@ -46,7 +47,7 @@ jobs: run: make check-diff - name: run tests - run: make tests + run: make test - name: build run: make build From 017e6a38cc68046b89c50ca41662e69fabadf279 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 15 May 2025 09:28:31 +0200 Subject: [PATCH 2/2] bump version --- VERSION | 2 +- charts/metrics-operator/Chart.yaml | 4 ++-- charts/metrics-operator/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 38830b8..992ac75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.5.0-dev +v0.5.1 diff --git a/charts/metrics-operator/Chart.yaml b/charts/metrics-operator/Chart.yaml index 687e188..1e6dce8 100644 --- a/charts/metrics-operator/Chart.yaml +++ b/charts/metrics-operator/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: metrics-operator description: A Helm chart for the metrics-operator type: application -version: v0.5.0 -appVersion: v0.5.0 +version: v0.5.1 +appVersion: v0.5.1 diff --git a/charts/metrics-operator/values.yaml b/charts/metrics-operator/values.yaml index 6a28348..e491880 100644 --- a/charts/metrics-operator/values.yaml +++ b/charts/metrics-operator/values.yaml @@ -8,7 +8,7 @@ image: repository: deploy-releases-hyperspace-docker.common.cdn.repositories.cloud.sap/cloud-orchestration/co-metrics-operator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v0.5.0 + tag: v0.5.1 imagePullSecrets: [] nameOverride: ""