From f41d3381ba7353e277554e049c664aaf594ffc9b Mon Sep 17 00:00:00 2001 From: skrishnan-sap <139535827+skrishnan-sap@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:24:36 +0200 Subject: [PATCH] [workflow] update package paths (#15) * [workflow] update package paths * update release tag --- .github/workflows/build.yml | 2 +- .github/workflows/docker-push.yml | 2 +- .github/workflows/publish-helm.yml | 4 ++-- config/default/kustomization.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d59bc29..ac78cd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: analysis: name: Analyze with Sonar Cloud - if: github.repository == 'sap/cap-operator-lifecycle' + if: github.repository_owner == 'sap' needs: build runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml index 8865edf..01ae1bb 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/docker-push.yml @@ -46,7 +46,7 @@ jobs: id: get_version_from_container_reg run: | export GHCR_TOKEN=$(echo ${{ github.token }} | base64) - echo "version=$(curl -H "Authorization: Bearer $GHCR_TOKEN" https://ghcr.io/v2/${{ github.repository_owner }}/cap-operator-manager/tags/list | jq '.tags[]' | sort -V | tail -n 2 | head -n 1)" >> $GITHUB_OUTPUT + echo "version=$(curl -H "Authorization: Bearer $GHCR_TOKEN" https://ghcr.io/v2/${{ github.repository }}/cap-operator-manager/tags/list | jq '.tags[]' | sort -V | tail -n 2 | head -n 1)" >> $GITHUB_OUTPUT - name: Print docker version from container registry run: "echo ${{ steps.get_version_from_container_reg.outputs.version }}" diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml index 1f3a5e6..6024499 100644 --- a/.github/workflows/publish-helm.yml +++ b/.github/workflows/publish-helm.yml @@ -7,7 +7,7 @@ env: HELM_VERSION: v3.11.3 REGISTRY: ghcr.io CHART_DIRECTORY: chart - RELEASE_TAG_PREFIX: cap-operator-helm + RELEASE_TAG_PREFIX: helm jobs: create_release_tag: @@ -168,5 +168,5 @@ jobs: chart_name=$(yq .name $CHART_DIRECTORY/Chart.yaml) chart_version=$(yq .version $CHART_DIRECTORY/Chart.yaml) file=$chart_name-$chart_version.tgz - repository=$REGISTRY/${{ github.repository_owner }}/$RELEASE_TAG_PREFIX + repository=$REGISTRY/${{ github.repository }}/$RELEASE_TAG_PREFIX helm --registry-config $RUNNER_TEMP/helm-config.json push $file oci://${repository,,} diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 47ea85b..a86fdf9 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -23,5 +23,5 @@ resources: images: - name: controller - newName: ghcr.io/sap/cap-operator-manager + newName: ghcr.io/sap/cap-operator-lifecycle/cap-operator-manager newTag: 0.0.1 \ No newline at end of file