From aae43821e7b437ff5738e15c5cd16d216d5ec52f Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:13:30 +0300
Subject: [PATCH] Simplify CI workflow

---
 .github/workflows/main.yml | 56 ++++++++++++++------------------------
 Readme.md                  |  6 ++--
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7cf13b9..e60beb8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,6 +25,8 @@ jobs:
       - name: Run tests
         # Tests need access to secrets, so we can't run them against PRs because of limited trust
         if: ${{ github.event_name != 'pull_request' }}
+        env:
+          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
         run: >
           dotnet test
           --configuration Release
@@ -33,8 +35,6 @@ jobs:
           --
           RunConfiguration.CollectSourceInformation=true
           DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
-        env:
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # 3.1.4
@@ -42,6 +42,10 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   pack:
+    strategy:
+      matrix:
+        app: [DiscordChatExporter.Cli, DiscordChatExporter.Gui]
+
     runs-on: windows-latest
     permissions:
       actions: write
@@ -56,35 +60,25 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
-      - name: Publish (CLI)
-        run: >
-          dotnet publish DiscordChatExporter.Cli
-          --output DiscordChatExporter.Cli/publish/
-          --configuration Release
-
-      - name: Publish (GUI)
+      - name: Publish app
         run: >
-          dotnet publish DiscordChatExporter.Gui
-          --output DiscordChatExporter.Gui/publish/
+          dotnet publish ${{ matrix.app }}
+          --output ${{ matrix.app }}/publish/
           --configuration Release
 
-      - name: Upload artifacts (CLI)
+      - name: Upload artifacts
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
         with:
-          name: DiscordChatExporter.Cli
-          path: DiscordChatExporter.Cli/publish/
-
-      - name: Upload artifacts (GUI)
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
-        with:
-          name: DiscordChatExporter
-          path: DiscordChatExporter.Gui/publish/
+          name: ${{ matrix.app }}
+          path: ${{ matrix.app }}/publish/
 
   deploy:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+
     needs:
       - test
       - pack
+
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -95,29 +89,19 @@ jobs:
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # 3.0.2
         with:
           name: DiscordChatExporter.Cli
-          path: DiscordChatExporter.Cli
+          path: DiscordChatExporter.Cli/
 
       - name: Download artifacts (GUI)
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # 3.0.2
         with:
-          name: DiscordChatExporter
-          path: DiscordChatExporter.Gui
+          name: DiscordChatExporter.Gui
+          path: DiscordChatExporter.Gui/
 
       - name: Create package (CLI)
-        shell: pwsh
-        run: >
-          Compress-Archive
-          -Path DiscordChatExporter.Cli/*
-          -DestinationPath DiscordChatExporter.Cli.zip
-          -Force
+        run: zip -r DiscordChatExporter.Cli.zip DiscordChatExporter.Cli/
 
       - name: Create package (GUI)
-        shell: pwsh
-        run: >
-          Compress-Archive
-          -Path DiscordChatExporter.Gui/*
-          -DestinationPath DiscordChatExporter.zip
-          -Force
+        run: zip -r DiscordChatExporter.Gui.zip DiscordChatExporter.Gui/
 
       - name: Create release
         env:
@@ -125,7 +109,7 @@ jobs:
         run: >
           gh release create "${{ github.ref_name }}"
           "DiscordChatExporter.Cli.zip"
-          "DiscordChatExporter.zip"
+          "DiscordChatExporter.Gui.zip#DiscordChatExporter.zip"
           --repo "${{ github.event.repository.full_name }}"
           --title "${{ github.ref_name }}"
           --notes "[Changelog](${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md)"
diff --git a/Readme.md b/Readme.md
index 4ee8a71..7dfbdc0 100644
--- a/Readme.md
+++ b/Readme.md
@@ -58,7 +58,7 @@ The following table lists all available download options:
       <td>
         <ul>
           <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.zip</code>)</li>
-          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.zip</code>)</li>
+          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.Gui.zip</code>)</li>
         </ul>
       </td>
       <td>
@@ -71,8 +71,8 @@ The following table lists all available download options:
       <td><b>CLI</b></td>
       <td>
         <ul>
-          <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.CLI.zip</code></li>
-          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.CLI.zip</code>)</li>
+          <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.Cli.zip</code></li>
+          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.Cli.zip</code>)</li>
           <li>🐋 <a href="https://hub.docker.com/r/tyrrrz/discordchatexporter">Docker</a> (<code>tyrrrz/discordchatexporter</code>)</li>
           <li>📦 <a href="https://aur.archlinux.org/packages/discord-chat-exporter-cli">AUR</a> (<code>discord-chat-exporter-cli</code>)</li>
           <li>📦 <a href="https://search.nixos.org/packages?query=discordchatexporter-cli">Nix</a> (<code>discordchatexporter-cli</code>)</li>