From 5712fb98ba8d876a85de9b6c7394d60cea58bc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=91=D0=B0?=
 =?UTF-8?q?=D0=B4=D1=8F=D0=B5=D0=B2?= <aleksei.badiaev@mousesoft.ru>
Date: Sat, 12 Oct 2024 15:48:25 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20release=20workflow.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/release.yaml | 63 ++++++++++-------------------------
 1 file changed, 17 insertions(+), 46 deletions(-)

diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index 453cc33..4dc70e0 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -11,6 +11,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     outputs:
+      version: ${{ steps.meta.outputs.VERSION }}
+      changes: ${{ steps.meta.outputs.CHANGES }}
       artifact_amd64: ${{ steps.build-amd.outputs.ARTIFACT }}
       artifact_arm64: ${{ steps.build-arm.outputs.ARTIFACT }}
     steps:
@@ -20,6 +22,14 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
+      - name: get meta-data
+        id: meta
+        run: |
+          echo "VERSION=$(make version)" >> $GITHUB_OUTPUT
+          echo 'CHANGES<<EOF' >> $GITHUB_OUTPUT
+          gawk -f scripts/changes.awk -v version=$(make version-number) CHANGELOG.md >> $GITHUB_OUTPUT
+          echo EOF >> $GITHUB_OUTPUT
+
       - name: set-up go
         uses: https://gitea.com/actions/setup-go@v3
         with:
@@ -93,37 +103,19 @@ jobs:
 
   deploy:
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.meta.outputs.VERSION }}
-      changes: ${{ steps.meta.outputs.CHANGES }}
     needs:
       - build
+      - build_windows
     steps:
-      - name: check-out repository code
-        uses: https://gitea.com/actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: get meta-data
-        id: meta
-        run: |
-          echo "VERSION=$(make version)" >> $GITHUB_OUTPUT
-          echo 'CHANGES<<EOF' >> $GITHUB_OUTPUT
-          gawk -f scripts/changes.awk -v version=$(make version-number) CHANGELOG.md >> $GITHUB_OUTPUT
-          echo EOF >> $GITHUB_OUTPUT
-
       - name: download debian amd64 package
         uses: https://gitea.com/actions/download-artifact@v3-node20
         with:
           name: ${{ needs.build.outputs.artifact_amd64 }}
-          path: out/
 
-      - name: download debian ard64 package
+      - name: download debian arm64 package
         uses: https://gitea.com/actions/download-artifact@v3-node20
         with:
           name: ${{ needs.build.outputs.artifact_arm64 }}
-          path: out/
 
       - name: deploy debian packages
         env:
@@ -144,42 +136,21 @@ jobs:
             Port $SSH_PORT
             StrictHostKeyChecking no
           END
-          cat ~/.ssh/config
-          make deploy
-
-  release:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-      - build_windows
-      - deploy
-    steps:
-      - name: download debian amd64 package
-        uses: https://gitea.com/actions/download-artifact@v3-node20
-        with:
-          name: ${{ needs.build.outputs.artifact_amd64 }}
-          path: out/
-
-      - name: download debian ard64 package
-        uses: https://gitea.com/actions/download-artifact@v3-node20
-        with:
-          name: ${{ needs.build.outputs.artifact_arm64 }}
-          path: out/
+          find -O1 . -name '*.changes' -exec dput mousesoft \{\} \;
 
       - name: download windows package
         uses: https://gitea.com/actions/download-artifact@v3-node20
         with:
           name: ${{ needs.build_windows.outputs.artifact }}
-          path: out/
 
       - name: release
         uses: https://gitea.com/actions/gitea-release-action@v1
         with:
-          title: "MouseSoft DrawIO-Export ${{ needs.deploy.outputs.version }}"
-          body: "${{ needs.deploy.outputs.changes }}"
+          title: "MouseSoft DrawIO-Export ${{ needs.build.outputs.version }}"
+          body: "${{ needs.build.outputs.changes }}"
           files: |
-            out/*.deb
-            out/*.msi
+            *.deb
+            *.msi
           sha256sum: true
           prerelease: true
           draft: true