From ba588115fde06df1137d096b2efd2ef48999f2a6 Mon Sep 17 00:00:00 2001
From: mitjaziv <mitjaz@gmail.com>
Date: Wed, 15 Nov 2023 18:20:46 +0100
Subject: [PATCH] TT-10430: fix release pipelines

---
 .github/workflows/release.yml | 37 +++++++++++++----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 86155a66..75bb28bd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,8 +4,6 @@ name: Draft release
 
 on:
   push:
-    branches:
-      - wftest/*
     tags:
       - "v*"
 
@@ -33,26 +31,17 @@ jobs:
         with:
           go-version: "1.20"
 
-      - name: Update 'make' on Linux
-        run: |
-          sudo apt-get update
-          sudo apt-get --only-upgrade install build-essential
-        if: ${{ matrix.platform == 'ubuntu-latest' }}
-
-      - name: Install 'make' on macOS
-        run: |
-          brew install make
-          echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
-        if: ${{ matrix.platform == 'macos-latest' }}
-
       - name: Build the CLI binary
-        run: make build-cli
+        run: |
+          cd mservctl
+          go build -o ../bin/mservctl
+          cd ..
 
       - name: Upload ${{ runner.os }} ${{ matrix.arch }} binary
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ env.BINARY_NAME }}.${{ runner.os }}.${{ matrix.arch }}
-          path: mservctl/${{ env.BINARY_NAME }}
+          name: mservctl.${{ runner.os }}.${{ matrix.arch }}
+          path: bin/mservctl
 
   release:
     needs: [build]
@@ -73,7 +62,8 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: ${{ env.BINARY_NAME }}.Linux.amd64
+          name: mservctl.Linux.amd64
+          path: mservctl.Linux.amd64
 
       - name: Attach Linux binary
         uses: actions/upload-release-asset@v1
@@ -81,13 +71,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.draft-release.outputs.upload_url }}
-          asset_path: ./${{ env.BINARY_NAME }}.Linux.amd64/${{ env.BINARY_NAME }}
-          asset_name: ${{ env.BINARY_NAME }}.linux.amd64
+          asset_name: mservctl.Linux.amd64
+          asset_path: mservctl.Linux.amd64/mservctl
           asset_content_type: application/octet-stream
 
       - uses: actions/download-artifact@v3
         with:
-          name: ${{ env.BINARY_NAME }}.macos.amd64
+          name: mservctl.macOS.amd64
+          path: mservctl.macOS.amd64
 
       - name: Attach macOS binary
         uses: actions/upload-release-asset@v1
@@ -95,6 +86,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.draft-release.outputs.upload_url }}
-          asset_path: ./${{ env.BINARY_NAME }}.macos.amd64/${{ env.BINARY_NAME }}
-          asset_name: ${{ env.BINARY_NAME }}.macos.amd64
+          asset_name: mservctl.macOS.amd64
+          asset_path: mservctl.macOS.amd64/mservctl
           asset_content_type: application/octet-stream