From 5612195f68c88767acd50be65178e954ea1a223e Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 30 Oct 2020 23:10:41 -0300 Subject: [PATCH] [skip ci] Sync workflow --- .github/dependabot.yml | 24 ++++++++++++------------ .github/workflows/sync.yml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/sync.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bf1d29431ca9..a240cabe5fa2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,7 +26,7 @@ updates: interval: 'daily' # Before cache workflow time: '23:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 labels: - 'theme: jhipster-internals' - 'theme: dependencies' @@ -46,7 +46,7 @@ updates: schedule: interval: 'daily' time: '12:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'blueprint :paw_prints:' @@ -60,7 +60,7 @@ updates: interval: 'daily' # Angular workflow is quite big. Give at least 2h interval. time: '03:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: angular' @@ -99,7 +99,7 @@ updates: schedule: interval: 'daily' time: '00:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: dependencies' @@ -111,7 +111,7 @@ updates: schedule: interval: 'daily' time: '07:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: front' @@ -124,7 +124,7 @@ updates: schedule: interval: 'daily' time: '00:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: dependencies' @@ -136,7 +136,7 @@ updates: schedule: interval: 'daily' time: '01:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: react' @@ -168,7 +168,7 @@ updates: schedule: interval: 'daily' time: '02:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: vue' @@ -196,7 +196,7 @@ updates: schedule: interval: 'daily' time: '00:20' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: docker :whale:' @@ -219,7 +219,7 @@ updates: interval: 'daily' # Maven doesn't have many PRs, but it triggers every client workflow. Let 2h of interval. time: '05:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' @@ -230,7 +230,7 @@ updates: schedule: interval: 'daily' time: '08:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' @@ -252,7 +252,7 @@ updates: schedule: interval: 'weekly' time: '00:30' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 labels: - 'theme: github_actions' - 'theme: CI builds' diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml new file mode 100644 index 000000000000..6b48009ca061 --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,30 @@ +name: 'Sync' +on: + workflow_dispatch: + schedule: + - cron: '10 */2 * * *' + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: 'SETUP: Checkout generator-jhipster' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: 'Rebase' + run: | + git config --global user.email "marceloshima@gmail.com" + git config --global user.name "Marcelo Shima" + git remote add upstream https://github.com/jhipster/generator-jhipster.git + git remote -v + git fetch upstream main + git branch -va + git branch upstream-main upstream/main + git push origin upstream-main + git checkout main + git rebase upstream/main + git push -f origin + #git fetch origin upstream_main + #git checkout upstream_main + #git rebase upstream/main