From eb8729e2354ba006a4d7c682593f07a606c7ac31 Mon Sep 17 00:00:00 2001
From: Sergei Razmetov <razmser@gmail.com>
Date: Thu, 13 Jun 2024 12:27:56 +0300
Subject: [PATCH] Fix workflow

---
 .github/workflows/build.yml | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54398be98..c8a819e74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,13 +73,13 @@ jobs:
       - run: build/makerpm.sh ${{matrix.image}}
       - uses: actions/upload-artifact@v4
         with:
-          name: statshouse-pkg-rpm-${{needs.env.outputs.version}}${{strategy.job-index}}
+          name: statshouse-pkg-rpm-${{needs.env.outputs.version}}-${{strategy.job-index}}
           path: RPMS/*.rpm
-  debian:
+  deb:
     strategy:
       matrix:
-        release: [bullseye, bookworm]
-    needs: [env, frontend]
+        release: [debian-bullseye, debian-bookworm, ubuntu-focal, ubuntu-jammy]
+    needs: [env]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -87,33 +87,14 @@ jobs:
           repository: VKCOM/statshouse
           ref: ${{needs.env.outputs.ref}}
           fetch-depth: 0
-      - run: echo "BUILD_VERSION=`echo ${{needs.env.outputs.version}} | sed -e 's:-:.:g'`" >> $GITHUB_ENV
-      - run: build/make-pkg.sh debian-${{matrix.release}}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: statshouse-pkg-debian-${{inputs.version}}${{github.run_number}}${{strategy.job-index}}
-          path: target/debian-${{matrix.release}}/*.deb
-  ubuntu:
-    strategy:
-      matrix:
-        release: [focal, jammy]
-    needs: [env, frontend]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: VKCOM/statshouse
-          ref: ${{needs.env.outputs.ref}}
-          fetch-depth: 0
-      - run: echo "BUILD_VERSION=`echo ${{needs.env.outputs.version}} | sed -e 's:-:.:g'`" >> $GITHUB_ENV
-      - run: build/make-pkg.sh ubuntu-${{matrix.release}}
+      - run: build/make-pkg.sh ${{matrix.release}}
       - uses: actions/upload-artifact@v4
         with:
-          name: statshouse-pkg-ubuntu-${{inputs.version}}${{github.run_number}}${{strategy.job-index}}
-          path: target/ubuntu-${{matrix.release}}/*.deb
+          name: statshouse-pkg-${{needs.env.outputs.version}}-${{github.run_number}}-${{matrix.release}}
+          path: target/${{matrix.release}}/*.deb
   draft_release:
     if: ${{ github.event.inputs.draft_release }}
-    needs: [env, rpm, ubuntu, debian]
+    needs: [env, rpm, deb]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4