Improved structure

FlorianRappl · May 19, 2021 · 8fdaa63 · 8fdaa63
1 parent 9966d14
commit 8fdaa63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: CI
 on: [push, pull_request]
 
 env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+  GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   CHOCOLATEY_API_KEY: ${{ secrets.CHOCOLATEY_API_KEY }}
 
 jobs:

diff --git a/build.cake b/build.cake
@@ -219,6 +219,7 @@ Task("Create-Squirrel-Package")
 
 Task("Create-Chocolatey-Package")
     .IsDependentOn("Copy-Files")
+    .WithCriteria(() => isRunningOnWindows)
     .Does(() => {
         var content = String.Format("$packageName = 'Mages'{1}$installerType = 'exe'{1}$url32 = 'https://github.com/FlorianRappl/Mages/releases/download/v{0}/Mages.exe'{1}$silentArgs = ''{1}{1}Install-ChocolateyPackage \"$packageName\" \"$installerType\" \"$silentArgs\" \"$url32\"", version, Environment.NewLine);
         var nuspec = chocolateyRoot + File("Mages.nuspec");
@@ -237,6 +238,7 @@ Task("Create-Chocolatey-Package")
 
 Task("Publish-Chocolatey-Package")
     .IsDependentOn("Create-Chocolatey-Package")
+    .WithCriteria(() => isRunningOnWindows)
     .Does(() => {
         var apiKey = EnvironmentVariable("CHOCOLATEY_API_KEY");
         var fileName = "Mages." + version + ".nupkg";
@@ -255,7 +257,7 @@ Task("Publish-Chocolatey-Package")
     });
 
 Task("Publish-GitHub-Release")
-    .IsDependentOn("Create-Squirrel-Package")
+    .IsDependentOn("Publish-Packages")
     .Does(() =>
     {
         var githubToken = EnvironmentVariable("GITHUB_API_TOKEN");
@@ -318,11 +320,10 @@ Task("Default")
 
 Task("Publish-Packages")
     .IsDependentOn("Publish-Nuget-Package")
-    .IsDependentOn("Publish-GitHub-Release")
     .IsDependentOn("Publish-Chocolatey-Package");
 
 Task("Publish")
-    .IsDependentOn("Publish-Packages");
+    .IsDependentOn("Publish-GitHub-Release");
 
 Task("PrePublish")
     .IsDependentOn("Publish-Packages");