From 60f625196fd59cca4aa0c294d348c83581ffc2e6 Mon Sep 17 00:00:00 2001
From: Sayan Nandan <nandansayan@outlook.com>
Date: Sat, 12 Feb 2022 12:27:06 +0530
Subject: [PATCH] Fix build matrix

---
 .build.yml                    |  1 +
 .github/workflows/release.yml | 34 +++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.build.yml b/.build.yml
index dc1836f6..912456b7 100644
--- a/.build.yml
+++ b/.build.yml
@@ -51,6 +51,7 @@ steps:
     image: rust
     environment:
       ARTIFACT: aarch64-linux-gnu
+      VERSION: ${DRONE_TAG}
     commands:
       - apt-get update && apt-get install zip -y
       - make bundle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 08547dea..fc9f4fee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,17 +15,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        rust:
+          [
+            x86_64-unknown-linux-gnu,
+            x86_64-unknown-linux-musl,
+            x86_64-apple-darwin,
+            x86_64-pc-windows-msvc,
+          ]
         include:
-          - os: ubuntu-latest
+          - rust: x86_64-unknown-linux-gnu
+            os: ubuntu-latest
+            artifact: x86_64-linux-gnu
+          - rust: x86_64-unknown-linux-musl
+            os: ubuntu-latest
             artifact: x86_64-linux-gnu
-            rust: x86_64-unknown-linux-gnu
-          - os: macos-latest
+          - rust: x86_64-apple-darwin
+            os: macos-latest
             artifact: x86_64-macos
-            rust: x86_64-apple-darwin
-          - os: windows-latest
+          - rust: x86_64-pc-windows-msvc
+            os: windows-latest
             artifact: x86_64-windows
-            rust: x86_64-pc-windows-msvc
     env:
       RUST_BACKTRACE: 1
       TARGET: ${{ matrix.rust }}
@@ -46,6 +55,10 @@ jobs:
           rustup default stable
           rustup target add ${{ matrix.rust }}
 
+      - name: Install MUSL tools
+        run: sudo apt update && sudo apt install musl-tools -y
+        if: matrix.rust == 'x86_64-unknown-linux-musl'
+
       - name: Make bundle
         run: make bundle
 
@@ -74,9 +87,7 @@ jobs:
           - os: windows-latest
             artifact: i686-windows
             rust: i686-pc-windows-msvc
-          - os: ubuntu-latest
-            rust: x86_64-unknown-linux-musl
-            artifact: x86_64-linux-musl
+
     env:
       RUST_BACKTRACE: 1
       TARGET: ${{ matrix.rust }}
@@ -96,9 +107,6 @@ jobs:
         run: sudo apt update && sudo apt install gcc-multilib -y
         if: runner.os == 'Linux'
 
-      - name: Install MUSL tools
-        run: sudo apt update && sudo apt install musl-tools -y
-        if: matrix.rust == 'x86_64-unknown-linux-musl'
       - name: Install Rust
         run: rustup target add ${{ matrix.rust }}