Skip to content

Commit bc4ce74

Browse files
committed
Link odh sync pr in gh workflow logs.
Signed-off-by: Humair Khan <[email protected]>
1 parent 15ea0c3 commit bc4ce74

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/scripts/release_prep/generate_pr.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ var=${MINOR_RELEASE_BRANCH} yq -i '.release_branch=env(var)' $tmp_config
3939
var=${MINOR_RELEASE_TAG} yq -i '.target_version_tag=env(var)' $tmp_config
4040
var=${PREVIOUS_RELEASE_TAG} yq -i '.previous_release_tag=env(var)' $tmp_config
4141

42-
4342
cat <<"EOF" > $body_txt
4443
This is an automated PR to prep Data Science Pipelines Operator for release.
4544
```yaml
@@ -52,7 +51,6 @@ sed -i "/<CONFIG_HERE>/{
5251
r ${tmp_config}
5352
}" $body_txt
5453

55-
5654
pr_url=$(gh pr create \
5755
--repo https://github.com/${DSPO_REPOSITORY_FULL} \
5856
--body-file $body_txt \
@@ -61,6 +59,4 @@ pr_url=$(gh pr create \
6159
--label "release-automation" \
6260
--base "${MINOR_RELEASE_BRANCH}")
6361

64-
65-
6662
echo "::notice:: PR successfully created: ${pr_url}"

.github/workflows/odh-manifests-PR-sync.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ jobs:
9696
git commit -m "Update DSPO to $TARGET_TAG"
9797
git push origin $BRANCH_NAME -f
9898
99-
gh pr create \
99+
pr_url=$(gh pr create \
100100
--repo https://github.com/${{ inputs.odh_manifest_org }}/odh-manifests \
101101
--body "This is an automated PR to update Data Science Pipelines Operator manifests to $TARGET_TAG" \
102102
--title "Update DSP Operator manifests to $TARGET_TAG" \
103103
--head "${{ env.GH_USER_NAME}}:$BRANCH_NAME" \
104-
--base "master"
104+
--base "master")
105105
106-
echo "::notice:: Changes detected in manifests, PR To ODH-Manifest Repo created."
106+
echo "::notice:: Changes detected in manifests, PR To ODH-Manifest Repo created: ${pr_url}"
107107
108108
else
109109
echo "::notice:: Changes No changes to manifests requested, no pr required to odh-manifests."

.github/workflows/release_prep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ jobs:
127127
name: checkout
128128
with:
129129
token: ${{ secrets.DSP_DEVS_ACCESS_TOKEN }}
130+
ref: ${{ env.MINOR_RELEASE_BRANCH }}
130131
- name: generate pr
131132
env:
132133
GH_TOKEN: ${{ secrets.DSP_DEVS_ACCESS_TOKEN }}

0 commit comments

Comments
 (0)