From a9e8cc0c59f7d97b8a2adc29e8d8ab2532c461d2 Mon Sep 17 00:00:00 2001
From: Maurice Panchaud <16801528+panmau@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:21:54 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20ci=20by=20using=20'run'=20command=20inste?=
 =?UTF-8?q?ad=20of=20'publish'=20=F0=9F=A7=B0=20(#9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml    | 13 ++-----------
 README.md                   |  2 +-
 src/SwitchTubeDl/Cli/Cli.fs |  2 +-
 src/Tests/Tests.fsproj      |  1 +
 src/dotnet-releaser.toml    |  2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e7bdf3b..9016b7b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,16 +23,7 @@ jobs:
                 with:
                     dotnet-version: '6.0.x'
 
-            -   name: Install dependencies 📦
-                run: dotnet restore src
-
-            -   name: Build project 🏗
-                run: dotnet build src -c Release --no-restore
-
-            -   name: Test 🏭
-                run: dotnet run --project src/Tests
-
-            -   name: Publish 🚀
+            -   name: Restore, Build, Tests, Publish (on tag) 🚀
                 run: |
                     dotnet tool install --global dotnet-releaser --version "0.3.*"
-                    dotnet-releaser publish --github-token ${{secrets.TOKEN_GITHUB}} src/dotnet-releaser.toml
+                    dotnet-releaser run --github-token "${{secrets.GITHUB_TOKEN}}" --github-token-extra "${{secrets.TOKEN_GITHUB}}" src/dotnet-releaser.toml
diff --git a/README.md b/README.md
index f859939..1e902c7 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ OPTIONS:
     --token, -t <token>   Token to access the SwitchTube API. Generate a token at
                           https://tube.switch.ch/access_tokens
     --path, -p <path>     Paths to download videos to (defaults to current dir). The path must already exist.
-    --skip, -s            Existing file handling option. Skip saving of already existing files. Prioritized if
+    --skip, -s            Existing file handling option. Skip download of already existing files. Prioritized if
                           multiple existing file options are given
     --force, -f           Existing file handling option. Overwrite already existing files
     --all, -a             Filter option. Downloads all videos in a channel
diff --git a/src/SwitchTubeDl/Cli/Cli.fs b/src/SwitchTubeDl/Cli/Cli.fs
index 19db912..925a54e 100644
--- a/src/SwitchTubeDl/Cli/Cli.fs
+++ b/src/SwitchTubeDl/Cli/Cli.fs
@@ -21,7 +21,7 @@ type CliArgs =
             | Token _ -> "Token to access the SwitchTube API. Generate a token at https://tube.switch.ch/access_tokens"
             | Path _ -> "Paths to download videos to (defaults to current dir). The path must already exist."
             | Skip ->
-                "Existing file handling option. Skip saving of already existing files. Prioritized if multiple existing file options are given"
+                "Existing file handling option. Skip download of already existing files. Prioritized if multiple existing file options are given"
             | Force -> "Existing file handling option. Overwrite already existing files"
             | All -> "Filter option. Downloads all videos in a channel"
             | Version -> "Display the current version."
diff --git a/src/Tests/Tests.fsproj b/src/Tests/Tests.fsproj
index 9e269f9..62cb9d0 100644
--- a/src/Tests/Tests.fsproj
+++ b/src/Tests/Tests.fsproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <IsPackable>false</IsPackable>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>TubeDl.Tests</RootNamespace>
diff --git a/src/dotnet-releaser.toml b/src/dotnet-releaser.toml
index 7d3088e..8739f6e 100644
--- a/src/dotnet-releaser.toml
+++ b/src/dotnet-releaser.toml
@@ -1,6 +1,6 @@
 # configuration file for dotnet-releaser
 [msbuild]
-project = "SwitchTubeDl/SwitchTubeDl.fsproj"
+project = "SwitchTubeDl.sln"
 [github]
 user = "panmau"
 repo = "switchtube-dl"