fix: correct github actions (artipie#1331)

olenagerasimova · Nov 14, 2023 · 4d1efd8 · 4d1efd8
1 parent 651fdc9
commit 4d1efd8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 25 deletions.
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -30,21 +30,9 @@ jobs:
       - run: mvn -B deploy -Pdocker -Ddocker.image.name=${{ secrets.DOCKERHUB_REPO }}
         working-directory: artipie-main
       - run: mvn versions:set -DnewVersion=latest
-        working-directory: artipie-main
       - run: mvn -B deploy -Pdocker -Ddocker.image.name=${{ secrets.DOCKERHUB_REPO }}
         working-directory: artipie-main
-      - name: Create Github Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ env.RELEASE_VERSION }}
-          draft: false
-          prerelease: false
-      - name: Create jar with dependencies
-        run: mvn package -Pjar-build -DskipTests
+      - run: mvn package -Pjar-build -DskipTests
         working-directory: artipie-main
       - name: Upload Release Asset
         id: upload-release-asset
@@ -57,6 +45,16 @@ jobs:
           asset_name: artipie-${{ env.RELEASE_VERSION }}-jar-with-dependencies.jar
           asset_content_type: application/jar
           working-directory: artipie-main
+      - name: Create Github Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ env.RELEASE_VERSION }}
+          draft: false
+          prerelease: false
   # run-benchmarks:
   #   runs-on: ubuntu-latest
   #   needs: docker-publish

diff --git a/.github/workflows/maven-adapter-release.yml b/.github/workflows/maven-adapter-release.yml
@@ -31,18 +31,8 @@ jobs:
         with:
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
-      - name: Build vertx-server
-        run: mvn -B install -DskipTests
-        working-directory: vertx-server
-      - name: Build http-client
-        run: mvn -B install -DskipTests
-        working-directory: http-client
-      - name: Build files-adapter
-        run: mvn -B install -DskipTests
-        working-directory: files-adapter
       - name: Set version
         run: mvn -B versions:set -DnewVersion=${{ steps.split.outputs._1 }} versions:commit
-        working-directory: ${{steps.split.outputs._0}}
       - name: Create settings.xml
         uses: whelk-io/maven-settings-xml-action@v15
         with:
@@ -64,8 +54,13 @@ jobs:
                 }
               }
             ]
-      - name: Deploy artifacts
-        run: mvn deploy -Partipie,publish,sonatype,gpg-sign -DskipITs --errors
+      - run: mvn -B install -DskipTests
+        working-directory: vertx-server
+      - run: mvn -B install -DskipTests
+        working-directory: http-client
+      - run: mvn -B install -DskipTests
+        working-directory: files-adapter
+      - run: mvn deploy -Partipie,publish,sonatype,gpg-sign -DskipITs --errors
         working-directory: ${{steps.split.outputs._0}}
       - name: Create Github Release
         id: create_release