From 87cdce8b15d1f369baca01b9c226e26037fd8b22 Mon Sep 17 00:00:00 2001
From: Robert Honz <exislow+github@gmail.com>
Date: Wed, 20 Dec 2023 12:05:53 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Release=20GUI=20fix.=20?=
 =?UTF-8?q?Docs=20added.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/on-release-master.yml | 47 ++++++++++++++++---------
 docs/index.md                           |  8 +++++
 docs/modules.md                         |  1 +
 pyproject.toml                          |  4 +--
 4 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 docs/index.md
 create mode 100644 docs/modules.md

diff --git a/.github/workflows/on-release-master.yml b/.github/workflows/on-release-master.yml
index d160f83..a77fd35 100644
--- a/.github/workflows/on-release-master.yml
+++ b/.github/workflows/on-release-master.yml
@@ -15,6 +15,9 @@ env:
   RELEASE_UPLOAD_URL: "release_upload_url"
   ASSET_EXTENSION: ".zip"
   OUT_NAME_FILE: "TIDAL-Downloader-NG"
+  ARCH_MACOS_X64: "macos-x64"
+  ARCH_LINUX_X64: "linux-x64"
+  ARCH_WINDOWS_X64: "windows-x64"
 
 jobs:
   publish:
@@ -77,11 +80,17 @@ jobs:
     outputs:
       ASSET_EXTENSION: ${{ env.ASSET_EXTENSION }}
       OUT_NAME_FILE: ${{ env.OUT_NAME_FILE }}
+      ARCH_MACOS_X64: ${{ env.ARCH_MACOS_X64 }}
+      ARCH_LINUX_X64: ${{ env.ARCH_LINUX_X64 }}
+      ARCH_WINDOWS_X64: ${{ env.ARCH_WINDOWS_X64 }}
     steps:
       - name: Compute outputs
         run: |
           echo "ASSET_EXTENSION=${{ env.ASSET_EXTENSION }}" >> $GITHUB_OUTPUT
           echo "OUT_NAME_FILE=${{ env.OUT_NAME_FILE }}" >> $GITHUB_OUTPUT
+          echo "ARCH_MACOS_X64=${{ env.ARCH_MACOS_X64 }}" >> $GITHUB_OUTPUT
+          echo "ARCH_LINUX_X64=${{ env.ARCH_LINUX_X64 }}" >> $GITHUB_OUTPUT
+          echo "ARCH_WINDOWS_X64=${{ env.ARCH_WINDOWS_X64 }}" >> $GITHUB_OUTPUT
   build-gui-and-upload-assets:
     needs: ["publish", "compute"]
     env:
@@ -93,39 +102,43 @@ jobs:
         include:
           - os: "macos-11"
             TARGET: "macos-11"
+            OS_ARCH: ${{needs.compute.outputs.ARCH_MACOS_X64}}
             CMD_BUILD: >
               brew install create-dmg &&
               source .venv/bin/activate &&
               poetry run make gui-macos &&
               cd dist &&
-              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" &&
-              cd ..
-          - os: "macos-13"
-            TARGET: "macos-13"
-            CMD_BUILD: >
-              brew install create-dmg &&
-              source .venv/bin/activate &&
-              poetry run make gui-macos &&
-              cd dist &&
-              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg/ -x "*.DS_Store" &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
               cd ..
+          # TODO: Use M1 runner.
+          #          - os: "macos-13"
+          #            TARGET: "macos-13"
+          #            CMD_BUILD: >
+          #              brew install create-dmg &&
+          #              source .venv/bin/activate &&
+          #              poetry run make gui-macos &&
+          #              cd dist &&
+          #              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
+          #              cd ..
           - os: "ubuntu-20.04"
             TARGET: "ubuntu-20.04"
+            OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}}
             CMD_BUILD: >
               source .venv/bin/activate &&
               poetry run make gui &&
               cd dist &&
-              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
               cd ..
           - os: "windows-2019"
             TARGET: "windows-2019"
+            OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}}
             CMD_BUILD: >
               choco feature enable -n=allowGlobalConfirmation
               choco install zip make
               source .venv/bin/activate &&
-              poetry run make gui &&
+              C:\Users\runneradmin\.local\bin\poetry run make gui &&
               cd dist &&
-              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe &&
+              zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}_${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe &&
               cd ..
     runs-on: ${{ matrix.os }}
     steps:
@@ -160,8 +173,8 @@ jobs:
         id: get_release_info
         shell: bash
         run: |
-          value=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt`
-          echo ::set-output name=upload_url::$value
+          VALUE=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt`
+          echo "upload_url=$VALUE" >> $GITHUB_OUTPUT
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
@@ -169,6 +182,6 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
         with:
           upload_url: ${{steps.get_release_info.outputs.upload_url}}
-          asset_path: ./dist/${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}}
-          asset_name: ${{needs.compute.outputs.OUT_NAME_FILE}}${{needs.compute.outputs.ASSET_EXTENSION}}
+          asset_path: ./dist/${{needs.compute.outputs.OUT_NAME_FILE}}_OS_ARCH_${{needs.compute.outputs.ASSET_EXTENSION}}
+          asset_name: ${{needs.compute.outputs.OUT_NAME_FILE}}_OS_ARCH_${{needs.compute.outputs.ASSET_EXTENSION}}
           asset_content_type: ${{env.ASSET_MIME}}
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..5cef2d1
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,8 @@
+# tidal-dl-ng
+
+[![Release](https://img.shields.io/github/v/release/exislow/tidal-dl-ng)](https://img.shields.io/github/v/release/exislow/tidal-dl-ng)
+[![Build status](https://img.shields.io/github/actions/workflow/status/exislow/tidal-dl-ng/main.yml?branch=main)](https://github.com/exislow/tidal-dl-ng/actions/workflows/main.yml?query=branch%3Amain)
+[![Commit activity](https://img.shields.io/github/commit-activity/m/exislow/tidal-dl-ng)](https://img.shields.io/github/commit-activity/m/exislow/tidal-dl-ng)
+[![License](https://img.shields.io/github/license/exislow/tidal-dl-ng)](https://img.shields.io/github/license/exislow/tidal-dl-ng)
+
+tidal-dl-ng
diff --git a/docs/modules.md b/docs/modules.md
new file mode 100644
index 0000000..0900579
--- /dev/null
+++ b/docs/modules.md
@@ -0,0 +1 @@
+::: tidal-dl-ng
diff --git a/pyproject.toml b/pyproject.toml
index 95d3fd3..f1dedca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "tidal-dl-ng"
-version = "0.4.19"
+version = "0.4.20"
 description = "TIDAL Medial Downloader Next Generation!"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
 repository = "https://github.com/exislow/tidal-dl-ng"
@@ -13,7 +13,7 @@ packages = [
 [tool.poetry]
 name = "tidal-dl-ng"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
-version = "0.4.19"
+version = "0.4.20"
 description = "TIDAL Medial Downloader Next Generation!"
 repository = "https://github.com/exislow/tidal-dl-ng"
 documentation = "https://exislow.github.io/tidal-dl-ng/"