From 757e3b454b0b6c17e9a2ac0dcebf75d0bf2cbc5a Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 14 Feb 2025 09:50:35 +0100 Subject: [PATCH 1/3] sync Signed-off-by: Coleen Iona Quadros --- .../workflows/rhobs-thanos-operator-sync.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/rhobs-thanos-operator-sync.yml diff --git a/.github/workflows/rhobs-thanos-operator-sync.yml b/.github/workflows/rhobs-thanos-operator-sync.yml new file mode 100644 index 0000000..7dd24b3 --- /dev/null +++ b/.github/workflows/rhobs-thanos-operator-sync.yml @@ -0,0 +1,36 @@ +name: Sync Fork + +on: + schedule: + - cron: '0 0 * * *' #every 24h + workflow_dispatch: + +permissions: + contents: write + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout your forked repository + uses: actions/checkout@v4 + with: + repository: rhobs/rhobs-thanos-operator + token: ${{ secrets.GITHUB_TOKEN }} + fetch-depth: 0 + + - name: Add upstream repository + run: | + git remote add upstream https://github.com/thanos-community/thanos-operator + git fetch upstream + + - name: Sync with upstream/main + run: | + git fetch upstream main + git checkout -B main origin/main + git merge upstream/main + git push origin main + + - name: Clean up + run: | + git remote remove upstream \ No newline at end of file From 39210673e60763732b9ab6060ce6d14e31c22032 Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 14 Feb 2025 09:51:15 +0100 Subject: [PATCH 2/3] sync Signed-off-by: Coleen Iona Quadros --- .github/workflows/rhobs-thanos-operator-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rhobs-thanos-operator-sync.yml b/.github/workflows/rhobs-thanos-operator-sync.yml index 7dd24b3..a78748d 100644 --- a/.github/workflows/rhobs-thanos-operator-sync.yml +++ b/.github/workflows/rhobs-thanos-operator-sync.yml @@ -33,4 +33,4 @@ jobs: - name: Clean up run: | - git remote remove upstream \ No newline at end of file + git remote remove upstream From 8a92caa5f03400d53506b8d1f08dfa52ccdf2dfb Mon Sep 17 00:00:00 2001 From: Coleen Iona Quadros Date: Fri, 14 Feb 2025 11:54:29 +0100 Subject: [PATCH 3/3] update Signed-off-by: Coleen Iona Quadros --- .github/workflows/rhobs-thanos-operator-sync.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rhobs-thanos-operator-sync.yml b/.github/workflows/rhobs-thanos-operator-sync.yml index a78748d..6babf6d 100644 --- a/.github/workflows/rhobs-thanos-operator-sync.yml +++ b/.github/workflows/rhobs-thanos-operator-sync.yml @@ -27,9 +27,9 @@ jobs: - name: Sync with upstream/main run: | git fetch upstream main - git checkout -B main origin/main + git checkout -B synced-main origin/synced-main git merge upstream/main - git push origin main + git push origin synced-main - name: Clean up run: |