rework compare-base action

jhipster · Jun 14, 2024 · 5b47446 · 5b47446
1 parent 5bbb175
commit 5b47446
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/actions/compare-base/action.yml b/.github/actions/compare-base/action.yml
@@ -37,13 +37,10 @@ runs:
     steps:
         - name: 'MERGE: Install base generator-jhipster'
           run: |
-              mkdir -p "${{ github.workspace }}/base/jhipster-kotlin"
-              cd "${{ github.workspace }}/base/jhipster-kotlin"
-              git clone "${{ github.workspace }}/jhipster-kotlin" .
-              git checkout @~1
-              git log
+              cd "${{ github.workspace }}/jhipster-kotlin"
+              git restore -s @~1 .
               npm install
-              cp "${{ github.workspace }}/jhipster-kotlin"/cli/cli.cjs cli/
+              git checkout cli/cli.cjs
           shell: bash
         - name: 'MERGE: merge base config'
           id: base-config