From 2f845841341f26c1f58775831e6c841903f10ae6 Mon Sep 17 00:00:00 2001
From: Aleksei Potsetsuev <wrouds@gmail.com>
Date: Tue, 15 Oct 2024 01:44:47 +0800
Subject: [PATCH] dbeaver/dbeaver-devops#1525 simplify workflow

---
 .github/workflows/java-checkstyle.yml |  8 +++-----
 .github/workflows/mvn-package.yml     | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/java-checkstyle.yml b/.github/workflows/java-checkstyle.yml
index d24f262..4ba59c6 100644
--- a/.github/workflows/java-checkstyle.yml
+++ b/.github/workflows/java-checkstyle.yml
@@ -29,11 +29,9 @@ jobs:
           repository: dbeaver/dbeaver-common
           path: dbeaver-config
 
-      - name: Copy checkstyle config
-        run: cp dbeaver-config/dbeaver-checkstyle-config.xml ./dbeaver-checkstyle-config.xml
-
-      - name: Remove checkstyle config directory
-        run: rm -rf dbeaver-config
+      - run: |
+          cp dbeaver-config/dbeaver-checkstyle-config.xml ./dbeaver-checkstyle-config.xml
+          rm -rf dbeaver-config
 
       - uses: dbeaver/action-java-checkstyle@master
         with:
diff --git a/.github/workflows/mvn-package.yml b/.github/workflows/mvn-package.yml
index 7980b9c..50db6b4 100644
--- a/.github/workflows/mvn-package.yml
+++ b/.github/workflows/mvn-package.yml
@@ -46,22 +46,18 @@ jobs:
       - name: Set repository path variable
         run: echo "CHECKOUT_PATH=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           path: ${{ env.CHECKOUT_PATH || '.' }}
 
-      - name: Clone Deps Repositories
+      - uses: dbeaver/github-actions/clone-repositories@devel
         if: ${{ inputs.project-deps != null }}
-        uses: dbeaver/github-actions/clone-repositories@devel
         with:
           project_deps_path: ${{ inputs.project-deps }}
           token: ${{ secrets.DEVOPS_ISSUE_RO_TOKEN }}
 
       - uses: dbeaver/github-actions/install-maven@devel
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "17"