Skip to content

Commit

Permalink
Merge pull request #117 from harshad16/rsync-master
Browse files Browse the repository at this point in the history
sync master branch with opendatahub release branch v1.9-branch
  • Loading branch information
openshift-merge-bot[bot] authored Oct 4, 2024
2 parents 4511fe9 + 090e4ea commit 1bbdc84
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 3 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/sync-branches-through-py.yaml
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.
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
2 changes: 1 addition & 1 deletion components/odh-notebook-controller/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IMG ?= quay.io/opendatahub/odh-notebook-controller
TAG ?= $(shell git describe --tags --always)

KF_IMG ?= quay.io/opendatahub/kubeflow-notebook-controller
KF_TAG ?= 1.9-1769b4b
KF_TAG ?= 1.9-fa442a1

CONTAINER_ENGINE ?= podman

Expand Down
2 changes: 1 addition & 1 deletion components/odh-notebook-controller/config/base/params.env
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

0 comments on commit 1bbdc84

Please sign in to comment.