From 6bf070b427eed88a309b617d1777c635804d8dd5 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 18 Jun 2024 16:34:50 -0300 Subject: [PATCH] update workflow for v8 base --- .github/workflows/angular.yml | 23 ++++------------------- .github/workflows/react.yml | 23 ++++------------------- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index dc4c82a06..7e0aa1aff 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -113,29 +113,14 @@ jobs: #---------------------------------------------------------------------- # Detect changes against base commit #---------------------------------------------------------------------- - # Revert samples rename to old name. - - uses: actions/setup-node@v4 - with: - node-version: 16 - - name: 'MERGE: generate base' - continue-on-error: true - id: base-app + - uses: jhipster/actions/compare-sample@v0 + id: compare if: >- github.event.pull_request && !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare') - uses: ./jhipster-kotlin/.github/actions/compare-base - with: - extra-args: '--skip-jhipster-dependencies --skip-ktlint-format ${{ matrix.extra-args }}' - - name: 'MERGE: compare changes' - continue-on-error: true - id: compare - if: steps.base-app.outcome == 'success' - uses: ./jhipster-kotlin/.github/actions/compare - with: - application-path: ${{ steps.base-app.outputs.application-path }} - - uses: actions/setup-node@v4 with: - node-version: 20 + generator-path: jhipster-kotlin + cmd: cli.cjs generate-sample --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} #---------------------------------------------------------------------- # Launch tests #---------------------------------------------------------------------- diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 722733fc7..c9a7a72da 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -113,29 +113,14 @@ jobs: #---------------------------------------------------------------------- # Detect changes against base commit #---------------------------------------------------------------------- - # Revert samples rename to old name. - - uses: actions/setup-node@v4 - with: - node-version: 16 - - name: 'MERGE: generate base' - continue-on-error: true - id: base-app + - uses: jhipster/actions/compare-sample@v0 + id: compare if: >- github.event.pull_request && !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare') - uses: ./jhipster-kotlin/.github/actions/compare-base - with: - extra-args: '--skip-jhipster-dependencies --skip-ktlint-format ${{ matrix.extra-args }}' - - name: 'MERGE: compare changes' - continue-on-error: true - id: compare - if: steps.base-app.outcome == 'success' - uses: ./jhipster-kotlin/.github/actions/compare - with: - application-path: ${{ steps.base-app.outputs.application-path }} - - uses: actions/setup-node@v4 with: - node-version: 20 + generator-path: jhipster-kotlin + cmd: cli.cjs generate-sample --skip-jhipster-dependencies --skip-install --skip-ktlint-format ${{ matrix.extra-args }} #---------------------------------------------------------------------- # Launch tests #----------------------------------------------------------------------