diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 581792f5ff40..f45a3545e02f 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' @@ -59,7 +59,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' @@ -98,7 +98,7 @@ updates: schedule: interval: 'daily' time: '00:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: dependencies' @@ -110,7 +110,7 @@ updates: schedule: interval: 'daily' time: '07:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: front' @@ -135,7 +135,7 @@ updates: schedule: interval: 'daily' time: '01:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: react' @@ -169,7 +169,7 @@ updates: schedule: interval: 'daily' time: '02:00' - open-pull-requests-limit: 10 + open-pull-requests-limit: 0 versioning-strategy: increase labels: - 'theme: vue' @@ -199,7 +199,7 @@ updates: schedule: interval: 'daily' time: '00:20' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: docker :whale:' @@ -215,7 +215,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' @@ -226,7 +226,7 @@ updates: schedule: interval: 'daily' time: '08:00' - open-pull-requests-limit: 5 + open-pull-requests-limit: 0 labels: - 'theme: dependencies' - 'theme: java' @@ -248,7 +248,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 diff --git a/generators/generate-blueprint/resources/package.json b/generators/generate-blueprint/resources/package.json index 9a56e8abdc76..60423e24e06c 100644 --- a/generators/generate-blueprint/resources/package.json +++ b/generators/generate-blueprint/resources/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "eslint": "9.7.0", + "eslint": "9.8.0", "globals": "15.8.0", "vitest": "2.0.4" }