From 7b0a68c2f40030586a5467513a62165301b67714 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Wed, 25 Oct 2023 15:34:44 -0400 Subject: [PATCH] Use scripts from workflow branch Previously it will use scripts from the release tag to do the release If we have to fix up the scripts for any reason we would have to retag This will allow us to modify the publishing script without having to retag the release. --- .github/workflows/publish-operator-hub.yaml | 12 +++++++++++- hack/publish-to-operator-hub.sh | 9 --------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-operator-hub.yaml b/.github/workflows/publish-operator-hub.yaml index d0ea5c29..aaf82290 100644 --- a/.github/workflows/publish-operator-hub.yaml +++ b/.github/workflows/publish-operator-hub.yaml @@ -27,7 +27,6 @@ on: description: 'GitHub organization for community-operator-prod project. default: redhat-openshift-ecosystem' required: true default: 'redhat-openshift-ecosystem' - jobs: promote: runs-on: ubuntu-latest @@ -46,6 +45,11 @@ jobs: run: | echo ${{ secrets.QUAY_TOKEN }} | docker login ${{github.event.inputs.image_registry}} -u ${{ secrets.QUAY_USER }} --password-stdin + - name: Checkout awx-operator at workflow branch + uses: actions/checkout@v4 + with: + path: awx-operator + - name: Checkout awx-opearator at TAG_NAME uses: actions/checkout@v4 with: @@ -53,6 +57,12 @@ jobs: ref: ${{ env.TAG_NAME }} path: awx-operator-${{ env.TAG_NAME }} + - name: Copy scripts to awx-operator-${{ env.TAG_NAME }} + run: | + cp -f \ + awx-operator/hack/publish-to-operator-hub.sh \ + awx-operator-${{ env.TAG_NAME }}/hack/publish-to-operator-hub.sh + - name: Build and publish bundle to operator-hub working-directory: awx-operator-${{ env.TAG_NAME }} env: diff --git a/hack/publish-to-operator-hub.sh b/hack/publish-to-operator-hub.sh index 52626edb..d3a7273c 100755 --- a/hack/publish-to-operator-hub.sh +++ b/hack/publish-to-operator-hub.sh @@ -121,12 +121,3 @@ gh pr create \ --head $FORK:$BRANCH \ --repo $COMMUNITY_OPERATOR_PROD_GITHUB_ORG/community-operators-prod popd - -# # -- Print Links to Branches -# echo "Commnity Operators: https://github.com/$FORK/community-operators/pull/new/$BRANCH" -# echo "Commnity Operators Prod: https://github.com/$FORK/community-operators-prod/pull/new/$BRANCH" - -# -- Cleanup -# rm -rf community-operators -# rm -rf community-operators-prod -# rm -rf bundle