Skip to content

Commit f68e07a

Browse files
mshimamshima
authored
Merge branch 'jhipster:main' into main
2 parents 8256f55 + f550e1a commit f68e07a

File tree

65 files changed

+476
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+476
-181
lines changed

‎.github/actions/build-cache/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ description: Build cache
2222
runs:
2323
using: composite
2424
steps:
25-
- uses: jhipster/actions/cache-npm-dependencies@v0
25+
- uses: jhipster/actions/cache-npm-dependencies@v1
2626
if: always()
2727
with:
2828
generator-path: generator-jhipster
@@ -32,14 +32,14 @@ runs:
3232
with:
3333
jhipster-bom-path: jhipster-bom
3434
generator-jhipster-path: generator-jhipster
35-
- uses: jhipster/actions/save-cache@v0
35+
- uses: jhipster/actions/save-cache@v1
3636
if: always()
3737
with:
3838
key: -${{ github.run_id }}
3939
npm: true
4040
maven: true
4141
gradle: true
42-
- uses: jhipster/actions/restore-cache@v0
42+
- uses: jhipster/actions/restore-cache@v1
4343
if: always()
4444
with:
4545
npm: true

‎.github/actions/cache-java-dependencies/action.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ inputs:
2929
runs:
3030
using: composite
3131
steps:
32-
- uses: jhipster/actions/setup-runner@v0
32+
- uses: jhipster/actions/setup-runner@v1
3333
with:
3434
binary-dir: ${{ github.workspace }}/generator-jhipster/bin
35+
npm-cache: false
3536
- name: 'mvn: install JHipster'
3637
run: |
3738
echo "::group::jhipster-bom"
@@ -42,11 +43,12 @@ runs:
4243
working-directory: ${{ github.workspace }}/${{ inputs.jhipster-bom-path }}
4344
- run: rm -rf tmp; mkdir tmp
4445
shell: bash
46+
if: always()
4547
working-directory: ${{ github.workspace }}
4648
- name: 'mvn(imperative): cache dependencies'
4749
run: |
4850
echo "::group::maven(imperative)"
49-
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --monorepository --skip-git
51+
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --monorepository --skip-git --skip-jhipster-dependencies
5052
npm run backend:build-cache -- --ntp || true
5153
cd app1
5254
./npmw -v
@@ -56,11 +58,12 @@ runs:
5658
working-directory: ${{ github.workspace }}/tmp
5759
- run: rm -rf tmp; mkdir tmp
5860
shell: bash
61+
if: always()
5962
working-directory: ${{ github.workspace }}
6063
- name: 'mvn(reactive): cache dependencies'
6164
run: |
6265
echo "::group::maven(reactive)"
63-
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --reactive --websocket no --monorepository --skip-git
66+
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --reactive --websocket no --monorepository --skip-git --skip-jhipster-dependencies
6467
npm install --force
6568
npm run backend:build-cache -- --ntp || true
6669
echo "::endgroup::"
@@ -69,11 +72,12 @@ runs:
6972
working-directory: ${{ github.workspace }}/tmp
7073
- run: rm -rf tmp; mkdir tmp
7174
shell: bash
75+
if: always()
7276
working-directory: ${{ github.workspace }}
7377
- name: 'gradle(imperative): cache dependencies'
7478
run: |
7579
echo "::group::gradle(imperative)"
76-
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --build gradle --monorepository --skip-git
80+
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --build gradle --monorepository --skip-git --skip-jhipster-dependencies
7781
npm install --force
7882
npm run backend:build-cache || true
7983
cd app1
@@ -84,11 +88,12 @@ runs:
8488
working-directory: ${{ github.workspace }}/tmp
8589
- run: rm -rf tmp; mkdir tmp
8690
shell: bash
91+
if: always()
8792
working-directory: ${{ github.workspace }}
8893
- name: 'gradle(reactive): cache dependencies'
8994
run: |
9095
echo "::group::gradle(reactive)"
91-
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --build gradle --reactive --websocket no --monorepository --skip-git
96+
jhipster.cjs generate-sample cache.jdl --skip-install --workspaces --build gradle --reactive --websocket no --monorepository --skip-git --skip-jhipster-dependencies
9297
npm install --force
9398
npm run backend:build-cache || true
9499
echo "::endgroup::"

‎.github/actions/setup-default-node-java/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ runs:
3232
echo "npm-version=$(grep -o '"npm": "[^"]*"' ${{ github.workspace }}/${{ inputs.generator-path }}/generators/common/resources/package.json | cut -f4 -d '"')" >> $GITHUB_OUTPUT
3333
shell: bash
3434
id: setup
35-
- uses: actions/setup-node@v4
35+
- uses: actions/setup-node@v5
3636
with:
3737
node-version: ${{ steps.setup.outputs.node-version }}
3838
- run: npm install -g npm@${{ steps.setup.outputs.npm-version }}
3939
shell: bash
40-
- uses: actions/setup-java@v4
40+
- uses: actions/setup-java@v5
4141
with:
4242
distribution: 'temurin'
4343
java-version: ${{ steps.setup.outputs.java-version }}

‎.github/dependabot.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,61 @@ updates:
264264
- 'theme: CI builds'
265265
- 'skip-changelog'
266266

267+
- package-ecosystem: 'github-actions'
268+
directory: '/.github/actions/build-cache/'
269+
schedule:
270+
interval: 'weekly'
271+
time: '00:30'
272+
open-pull-requests-limit: 10
273+
labels:
274+
- 'theme: github_actions'
275+
- 'theme: CI builds'
276+
- 'skip-changelog'
277+
278+
- package-ecosystem: 'github-actions'
279+
directory: '/.github/actions/cache-java-dependencies/'
280+
schedule:
281+
interval: 'weekly'
282+
time: '00:30'
283+
open-pull-requests-limit: 10
284+
labels:
285+
- 'theme: github_actions'
286+
- 'theme: CI builds'
287+
- 'skip-changelog'
288+
289+
- package-ecosystem: 'github-actions'
290+
directory: '/.github/actions/setup-default-node-java/'
291+
schedule:
292+
interval: 'weekly'
293+
time: '00:30'
294+
open-pull-requests-limit: 10
295+
labels:
296+
- 'theme: github_actions'
297+
- 'theme: CI builds'
298+
- 'skip-changelog'
299+
300+
- package-ecosystem: 'github-actions'
301+
directory: '/.github/actions/sonar/'
302+
schedule:
303+
interval: 'weekly'
304+
time: '00:30'
305+
open-pull-requests-limit: 10
306+
labels:
307+
- 'theme: github_actions'
308+
- 'theme: CI builds'
309+
- 'skip-changelog'
310+
311+
- package-ecosystem: 'github-actions'
312+
directory: '/generators/ci-cd/generators/bootstrap/resources/dependabot/'
313+
schedule:
314+
interval: 'weekly'
315+
time: '00:30'
316+
open-pull-requests-limit: 10
317+
labels:
318+
- 'theme: github_actions'
319+
- 'theme: CI builds'
320+
- 'skip-changelog'
321+
267322
- package-ecosystem: 'gradle'
268323
directory: '/generators/java/generators/graalvm/resources/'
269324
schedule:

‎.github/workflows/angular.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
path: generator-jhipster
8888
fetch-depth: 2
89-
- uses: jhipster/actions/setup-runner@v0
89+
- uses: jhipster/actions/setup-runner@v1
9090
with:
9191
node-version: ${{ matrix.node-version }}
9292
java-version: ${{ matrix.java-version }}
@@ -109,7 +109,7 @@ jobs:
109109
#----------------------------------------------------------------------
110110
# Detect changes against base commit
111111
#----------------------------------------------------------------------
112-
- uses: jhipster/actions/compare-sample@v0
112+
- uses: jhipster/actions/compare-sample@v1
113113
id: compare
114114
if: >-
115115
github.event.pull_request &&
@@ -126,7 +126,7 @@ jobs:
126126
#----------------------------------------------------------------------
127127
# Launch tests
128128
#----------------------------------------------------------------------
129-
- uses: jhipster/actions/build-jhipster-bom@v0
129+
- uses: jhipster/actions/build-jhipster-bom@v1
130130
if: matrix.build-jhipster-bom && steps.compare.outputs.equals != 'true'
131131
with:
132132
jhipster-bom-ref: ${{ matrix.jhipster-bom-branch }}

‎.github/workflows/devserver.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
path: generator-jhipster
7777
fetch-depth: 2
78-
- uses: jhipster/actions/setup-runner@v0
78+
- uses: jhipster/actions/setup-runner@v1
7979
with:
8080
node-version: ${{ matrix.node-version }}
8181
java-version: ${{ matrix.java-version }}
@@ -96,7 +96,7 @@ jobs:
9696
#----------------------------------------------------------------------
9797
# Launch tests
9898
#----------------------------------------------------------------------
99-
- uses: jhipster/actions/build-jhipster-bom@v0
99+
- uses: jhipster/actions/build-jhipster-bom@v1
100100
with:
101101
jhipster-bom-ref: ${{ matrix.jhipster-bom-branch }}
102102
- name: 'E2E: Run'

‎.github/workflows/docker-compose-integration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
path: generator-jhipster
6767
fetch-depth: 2
68-
- uses: jhipster/actions/setup-runner@v0
68+
- uses: jhipster/actions/setup-runner@v1
6969
with:
7070
node-version: ${{ matrix.node-version }}
7171
java-version: ${{ matrix.java-version }}
@@ -75,7 +75,7 @@ jobs:
7575
binary-dir: ${{ github.workspace }}/generator-jhipster/bin
7676
- run: npm ci --ignore-scripts
7777
working-directory: ${{ github.workspace }}/generator-jhipster
78-
- uses: jhipster/actions/build-jhipster-bom@v0
78+
- uses: jhipster/actions/build-jhipster-bom@v1
7979
with:
8080
jhipster-bom-ref: main
8181
- name: Generate project

‎.github/workflows/docker-image-publish-github-registry.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Login to GitHub Container Registry
5454
if: github.event_name != 'pull_request'
55-
uses: docker/login-action@v3.5.0
55+
uses: docker/login-action@v3.6.0
5656
with:
5757
registry: ghcr.io
5858
username: ${{ github.repository_owner }}
@@ -62,7 +62,7 @@ jobs:
6262
env:
6363
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
6464
if: ${{env.DOCKERHUB_USERNAME != '' && startsWith(github.ref, 'refs/tags/v')}}
65-
uses: docker/login-action@v3.5.0
65+
uses: docker/login-action@v3.6.0
6666
id: login-hub
6767
with:
6868
username: ${{ secrets.DOCKERHUB_USERNAME }}

‎.github/workflows/generator-database-changelog-liquibase.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
path: generator-jhipster
6161
- uses: ./generator-jhipster/.github/actions/setup-default-node-java
62-
- uses: jhipster/actions/setup-runner@v0
62+
- uses: jhipster/actions/setup-runner@v1
6363
with:
6464
maven-cache: true
6565
binary-dir: ${{ github.workspace }}/generator-jhipster/bin
@@ -68,7 +68,7 @@ jobs:
6868
#----------------------------------------------------------------------
6969
# Install JHipster and generate project+entities
7070
#----------------------------------------------------------------------
71-
- uses: jhipster/actions/build-jhipster-bom@v0
71+
- uses: jhipster/actions/build-jhipster-bom@v1
7272
with:
7373
jhipster-bom-ref: main
7474
- run: jhipster.cjs generate-sample incremental-changelog-samples/liquibase-jdl-rename-field/app.jdl --skip-jhipster-dependencies

‎.github/workflows/generator-generate-blueprint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
path: generator-jhipster
4646
fetch-depth: 2
4747
- uses: ./generator-jhipster/.github/actions/setup-default-node-java
48-
- uses: jhipster/actions/setup-runner@v0
48+
- uses: jhipster/actions/setup-runner@v1
4949
with:
5050
maven-cache: true
5151
binary-dir: ${{ github.workspace }}/generator-jhipster/bin
@@ -56,7 +56,7 @@ jobs:
5656
#----------------------------------------------------------------------
5757
# Install JHipster and generate project+entities
5858
#----------------------------------------------------------------------
59-
- uses: jhipster/actions/build-jhipster-bom@v0
59+
- uses: jhipster/actions/build-jhipster-bom@v1
6060
with:
6161
jhipster-bom-ref: main
6262
- name: 'GENERATION: generate blueprint'

0 commit comments

Comments
 (0)