forked from opendatahub-io/kubeflow
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #117 from harshad16/rsync-master
sync master branch with opendatahub release branch v1.9-branch
- Loading branch information
Showing
4 changed files
with
50 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
--- | ||
name: Sync branches through Pull Request | ||
|
||
on: # yamllint disable-line rule:truthy | ||
workflow_dispatch: | ||
inputs: | ||
source: | ||
description: Source branch | ||
required: true | ||
target: | ||
description: Target branch | ||
required: true | ||
|
||
jobs: | ||
sync: | ||
permissions: | ||
contents: write | ||
pull-requests: write | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.event.inputs.target }} | ||
fetch-depth: 0 | ||
|
||
- name: Prepare sync branch | ||
id: prepare | ||
run: | | ||
git fetch origin ${{ github.event.inputs.source }} | ||
git reset --hard origin/${{ github.event.inputs.source }} | ||
TIMESTAMP=$(date +'%Y%m%d%H%M%S') | ||
SYNC_BRANCH=sync__${{ github.event.inputs.source }}__${{ github.event.inputs.target }}__${TIMESTAMP} | ||
echo "branch=$SYNC_BRANCH" >> $GITHUB_OUTPUT | ||
- name: Create pull request | ||
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 | ||
with: | ||
branch: ${{ steps.prepare.outputs.branch }} | ||
title: "Sync `${{ github.event.inputs.target }}` branch with `${{ github.event.inputs.source }}` branch" | ||
body: | | ||
:robot: This is an automated Pull Request created by `/.github/workflows/sync-branches-through-pr.yml`. | ||
It merges all commits from `${{ github.event.inputs.source }}` branch into `${{ github.event.inputs.target }}` branch. | ||
:warning: **IMPORTANT NOTE**: Remember to delete the `${{ steps.prepare.outputs.branch }}` branch after merging the changes. |
2 changes: 1 addition & 1 deletion
2
components/notebook-controller/config/overlays/openshift/params.env
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:stable | ||
odh-kf-notebook-controller-image=quay.io/opendatahub/kubeflow-notebook-controller:1.9-fa442a1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:stable | ||
odh-notebook-controller-image=quay.io/opendatahub/odh-notebook-controller:1.9-fa442a1 |