Merge branch 'master' into dev/jorobich/skip-myget-push

OmniSharp · Oct 27, 2022 · 865bded · 865bded
2 parents 6a2f58b + 437c157
commit 865bded
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,6 +13,8 @@ defaults:
     shell: pwsh
 on:
   pull_request:
+    paths-ignore:
+      - 'CHANGELOG.md'
     branches:
       - master
       - feature/*

diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
@@ -13,6 +13,8 @@ defaults:
     shell: pwsh
 on:
   pull_request:
+    paths-ignore:
+      - 'CHANGELOG.md'
     branches:
       - master
       - demo/*

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,6 +13,8 @@ defaults:
     shell: pwsh
 on:
   pull_request:
+    paths-ignore:
+      - 'CHANGELOG.md'
     branches:
       - master
       - feature/*

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,6 +18,9 @@ pr:
     include:
       - master
       - feature/*
+  paths:
+    exclude:
+      - 'CHANGELOG.md'
 
 resources:
   repositories:

diff --git a/build.cake b/build.cake
@@ -507,20 +507,23 @@ Task("PublishNet6Builds")
     {
         if (publishAll)
         {
-            if (!Platform.Current.IsWindows)
+            if (Platform.Current.IsWindows)
+            {
+                PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0");
+            }
+            else if (Platform.Current.IsMacOS)
             {
-                PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0");
-                PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0");
-                PublishBuild(project, env, buildPlan, configuration, "linux-musl-x64", "net6.0");
-                PublishBuild(project, env, buildPlan, configuration, "linux-musl-arm64", "net6.0");
                 PublishBuild(project, env, buildPlan, configuration, "osx-x64", "net6.0");
                 PublishBuild(project, env, buildPlan, configuration, "osx-arm64", "net6.0");
             }
             else
             {
-                PublishBuild(project, env, buildPlan, configuration, "win7-x86", "net6.0");
-                PublishBuild(project, env, buildPlan, configuration, "win7-x64", "net6.0");
-                PublishBuild(project, env, buildPlan, configuration, "win10-arm64", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "linux-x64", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "linux-arm64", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "linux-musl-x64", "net6.0");
+                PublishBuild(project, env, buildPlan, configuration, "linux-musl-arm64", "net6.0");
             }
         }
         else if (Platform.Current.IsWindows)