From 783208f5b28de2e8cd7bb91f357b8eec380fa924 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 30 Oct 2020 23:10:41 -0300 Subject: [PATCH 1/5] [skip ci] Sync workflow --- .github/dependabot.yml | 18 +++++++++--------- .github/workflows/sync.yml | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/sync.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cfb53d5344ab..3516745b2130 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' @@ -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' @@ -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' @@ -170,7 +170,7 @@ updates: schedule: interval: 'daily' time: '02:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: vue' @@ -200,7 +200,7 @@ updates: schedule: interval: 'daily' time: '00:20' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: docker :whale:' @@ -216,7 +216,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' @@ -249,7 +249,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..2b47af218b7d --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,24 @@ +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 rebase upstream/main + git push -f origin From c534a32c1624637b69aa2fdd5207c76f4e27e621 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 24 Mar 2023 09:57:26 -0300 Subject: [PATCH 2/5] [skip ci] adjusts --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3516745b2130..aabadb829f5e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -227,7 +227,7 @@ updates: schedule: interval: 'daily' time: '08:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' From 020f631c767b48622e0fc5924e1949812874ef11 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 28 Oct 2023 14:45:00 -0300 Subject: [PATCH 3/5] Update sync.yml --- .github/workflows/sync.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 2b47af218b7d..bde7e0ddf4b1 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -22,3 +22,8 @@ jobs: git branch -va git rebase upstream/main git push -f origin + git branch upstream-main upstream/main + #git fetch origin upstream_main + #git checkout upstream_main + #git rebase upstream/main + git push origin upstream-main From b896a0eabbd83c8dd25e92f7da5523563fc8985a Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 28 Mar 2024 15:58:39 -0300 Subject: [PATCH 4/5] Update sync.yml --- .github/workflows/sync.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index bde7e0ddf4b1..6b48009ca061 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -20,10 +20,11 @@ jobs: 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 branch upstream-main upstream/main #git fetch origin upstream_main #git checkout upstream_main #git rebase upstream/main - git push origin upstream-main From eef4ba29d165136159b64a3af17322acc124ad96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 01:01:46 +0000 Subject: [PATCH 5/5] Bump husky from 9.1.4 to 9.1.5 in /generators/javascript/resources Bumps [husky](https://github.com/typicode/husky) from 9.1.4 to 9.1.5. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.4...v9.1.5) --- updated-dependencies: - dependency-name: husky dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- generators/javascript/resources/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/javascript/resources/package.json b/generators/javascript/resources/package.json index 51e13c2a01cd..6072d2c5e999 100644 --- a/generators/javascript/resources/package.json +++ b/generators/javascript/resources/package.json @@ -2,7 +2,7 @@ "dependencies": { "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", - "husky": "9.1.4", + "husky": "9.1.5", "lint-staged": "15.2.9" } }