From fe0fc1a98afde0c81469acae3fe5956ac6411d5b Mon Sep 17 00:00:00 2001
From: Sven Assmann <sven.assmann.it@gmail.com>
Date: Mon, 14 Feb 2022 00:18:59 +0100
Subject: [PATCH] fix(ci): release-binary-assets.yml

- undo a couple of changes
---
 .github/workflows/deploy.yml                | 14 ++++++++++-
 .github/workflows/release-binary-assets.yml | 26 +++++++--------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 070c358..7a0705d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,9 +29,21 @@ jobs:
         with:
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
 
+  # https://github.com/mislav/bump-homebrew-formula-action
+  publish-to-brew:
+    name: post / homebrew
+    needs: [publish]
+    runs-on: macos-latest
+    steps:
+      - uses: mislav/bump-homebrew-formula-action@v1
+        with:
+          formula-name: t-rec
+        env:
+          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
+
   release:
     name: post / github release
-    needs: publish
+    needs: [publish]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release-binary-assets.yml b/.github/workflows/release-binary-assets.yml
index 5e1f1cf..40655ed 100644
--- a/.github/workflows/release-binary-assets.yml
+++ b/.github/workflows/release-binary-assets.yml
@@ -6,17 +6,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  # https://github.com/mislav/bump-homebrew-formula-action
-  publish-to-brew:
-    name: post / homebrew
-    runs-on: macos-latest
-    steps:
-      - uses: mislav/bump-homebrew-formula-action@v1
-        with:
-          formula-name: t-rec
-        env:
-          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
-
   release:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -58,10 +47,10 @@ jobs:
         env:
           TARGET: ${{ matrix.target }}
           TAG: ${{ github.event.release.tag_name }}
+          FILENAME: ${{ matrix.binName }}-$TAG-$TARGET.tar.gz
         run: |
-          filename="t-rec-$TAG-$TARGET.tar.gz"
-          tar -czvf "$filename" README.md LICENSE -C "target/$TARGET/release" "${{ matrix.binName }}"
-          echo "::set-output name=filename::$filename"
+          tar -czvf "$FILENAME" README.md LICENSE -C "target/$TARGET/release" "${{ matrix.binName }}"
+          echo "::set-output name=filename::$FILENAME"
       - name: Upload Archive
         uses: ncipollo/release-action@v1.8.7
         with:
@@ -80,19 +69,22 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: build .deb file
+        env:
+          TARGET: x86_64-unknown-linux-musl
+          TAG: ${{ github.event.release.tag_name }}
         uses: sassman/rust-deb-builder@v1
       - name: Archive deb artifact
         uses: actions/upload-artifact@v2
         with:
-          name: t-rec-amd64-static.deb
-          path: target/x86_64-unknown-linux-musl/debian/t-rec*.deb
+          name: t-rec-$TAG-$TARGET.deb
+          path: target/$TARGET/debian/t-rec*.deb
       - name: upload deb file
         uses: ncipollo/release-action@v1.8.7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           allowUpdates: true
           artifactErrorsFailBuild: true
-          artifacts: target/x86_64-unknown-linux-musl/debian/t-rec*.deb
+          artifacts: target/$TARGET/debian/t-rec*.deb
           artifactContentType: application/octet-stream
           omitBodyDuringUpdate: true
           omitNameDuringUpdate: true