Skip to content

Commit

Permalink
Merge pull request #2465 from OmniSharp/dev/jorobich/build-by-platofmr
Browse files Browse the repository at this point in the history
Infrastructure improvements
  • Loading branch information
JoeRobich authored Oct 27, 2022
2 parents 61ee5ed + ac3f8e3 commit 437c157
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ defaults:
shell: pwsh
on:
pull_request:
paths-ignore:
- 'CHANGELOG.md'
branches:
- master
- feature/*
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests-net6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ defaults:
shell: pwsh
on:
pull_request:
paths-ignore:
- 'CHANGELOG.md'
branches:
- master
- demo/*
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ defaults:
shell: pwsh
on:
pull_request:
paths-ignore:
- 'CHANGELOG.md'
branches:
- master
- feature/*
Expand Down
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ pr:
include:
- master
- feature/*
paths:
exclude:
- 'CHANGELOG.md'

resources:
repositories:
Expand Down
19 changes: 11 additions & 8 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 437c157

Please sign in to comment.