Skip to content

Commit 8e3f636

Browse files
authored
CLOUDP-141994: Fix create release job (#759)
Fix trigger condition on create release job
1 parent 3925504 commit 8e3f636

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

.github/workflows/release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ jobs:
6767
env:
6868
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6969
with:
70-
REVIEWERS: priyolahiri,fabritsius,igor-karpukhin,sugar-pack
70+
REVIEWERS: priyolahiri,fabritsius,igor-karpukhin,sugar-pack,helderjs

.github/workflows/release-post-merge.yml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
create-release:
1818
name: Create Release
19-
if: (github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.sha, 'release')) || github.event.inputs.version != ''
19+
if: ( ${{github.event.pull_request.merged == true }} && startsWith(github.head_ref, 'release/')) || github.event.inputs.version != ''
2020
runs-on: ubuntu-latest
2121
env:
2222
DOCKER_RELEASE_REPO: mongodb/mongodb-atlas-kubernetes-operator
@@ -32,7 +32,7 @@ jobs:
3232
- name: Print Env and Get version
3333
id: tag
3434
env:
35-
BRANCH: ${{ github.event.pull_request.head.sha }}
35+
BRANCH: ${{ github.head_ref }}
3636
VERSION: ${{ github.event.inputs.version }}
3737
run: |
3838
version=$VERSION
@@ -99,34 +99,6 @@ jobs:
9999
tags: ${{ steps.prepare-quay-image-tag.outputs.tags }}
100100
build-args: VERSION=${{ steps.tag.outputs.tag }}
101101

102-
# - name: Now Prepare RedHadConnect image
103-
# uses: ./.github/actions/gen-install-scripts
104-
# with:
105-
# IMAGE_URL: ${{ env.REDHAT_RELEASE_REGISTRY }}/${{ env.REDHAT_OPERATOR_REPO }}:${{ env.VERSION }}
106-
# VERSION: ${{ env.VERSION }}
107-
# ENV: prod
108-
# - name: Login to RedHat registry
109-
# uses: docker/login-action@v2
110-
# with:
111-
# registry: ${{ env.REDHAT_SCAN_RELEASE_REGISTRY }}
112-
# username: unused
113-
# password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
114-
# - name: Prepare docker RedHat image tag
115-
# id: prepare-redhat-image-tag
116-
# run: |
117-
# REPOSITORY=${{ env.REDHAT_SCAN_OPERATOR_REPO }}
118-
# TAG=${{ steps.tag.outputs.version }}
119-
# TAGS="${REPOSITORY}:${TAG}"
120-
# echo "tags=$TAGS" >> $GITHUB_OUTPUT
121-
# - name: Push Atlas Operator to RedHat Connect
122-
# uses: docker/build-push-action@v3
123-
# with:
124-
# context: .
125-
# push: true
126-
# tags: ${{ steps.prepare-redhat-image-tag.outputs.tags }}
127-
# labels: version=${{ steps.tag.outputs.version }}
128-
# build_args: VERSION=${{ steps.tag.outputs.tag }}
129-
130102
- name: Create Release
131103
id: create_release
132104
uses: actions/create-release@v1

0 commit comments

Comments
 (0)