Skip to content

Use dotnet fallout instead of ./build.cmd in AppVeyor and Azure Pipelines steps #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ChrisonSimtian wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use dotnet fallout instead of ./build.cmd in AppVeyor and Azure Pipelines steps #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Fallout.Common/CI/AppVeyor/Configuration/AppVeyorConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,13 @@ public override void Write(CustomFileWriter writer)

using (writer.WriteBlock("build_script:"))
{
writer.WriteLine($@"- cmd: .\{BuildCmdPath} {InvokedTargets.JoinSpace()}");
writer.WriteLine($@"- sh: ./{BuildCmdPath} {InvokedTargets.JoinSpace()}");
// Invoke the `fallout` local tool (cross-platform) rather than the OS-specific build script.
// AppVeyor runs `- cmd:` lines only on Windows images and `- sh:` lines only on the rest, so
// emit both; the command itself is identical. See GitHub Actions (dotnet fallout) and issue #516.
writer.WriteLine("- cmd: dotnet tool restore");
writer.WriteLine($"- cmd: dotnet fallout {InvokedTargets.JoinSpace()}");
writer.WriteLine("- sh: dotnet tool restore");
writer.WriteLine($"- sh: dotnet fallout {InvokedTargets.JoinSpace()}");
}

if (Cache.Length > 0)
Expand Down
5 changes: 4 additions & 1 deletion src/Fallout.Common/CI/AzurePipelines/Configuration/AzurePipelinesCmdStep.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ public override void Write(CustomFileWriter writer)

using (writer.WriteBlock("inputs:"))
{
writer.WriteLine($"script: './{BuildCmdPath} {arguments}'");
// Invoke the `fallout` local tool (cross-platform) rather than the OS-specific build script.
// CmdLine@2 runs in the agent's default shell (cmd on Windows, bash elsewhere); `&&` works in
// both. See GitHub Actions (dotnet fallout) and issue #516.
writer.WriteLine($"script: 'dotnet tool restore && dotnet fallout {arguments}'");
}

if (Imports.Count > 0)
Expand Down
6 changes: 4 additions & 2 deletions .../ConfigurationGenerationSpecs.Test_testName=null_attribute=AppVeyorAttribute.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ install:
- git submodule update --init --recursive

build_script:
- cmd: .\build.cmd Test
- sh: ./build.cmd Test
- cmd: dotnet tool restore
- cmd: dotnet fallout Test
- sh: dotnet tool restore
- sh: dotnet fallout Test

artifacts:
- path: 'src/*/obj/**'
Expand Down
16 changes: 8 additions & 8 deletions ...gurationGenerationSpecs.Test_testName=null_attribute=AzurePipelinesAttribute.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Restore'
inputs:
script: './build.cmd Restore --skip'
script: 'dotnet tool restore && dotnet fallout Restore --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -99,7 +99,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Compile'
inputs:
script: './build.cmd Compile --skip'
script: 'dotnet tool restore && dotnet fallout Compile --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -134,7 +134,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Test'
inputs:
script: './build.cmd Test --skip --partition $(System.JobPositionInPhase)/2'
script: 'dotnet tool restore && dotnet fallout Test --skip --partition $(System.JobPositionInPhase)/2'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -167,7 +167,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Coverage'
inputs:
script: './build.cmd Coverage --skip'
script: 'dotnet tool restore && dotnet fallout Coverage --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -206,7 +206,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Restore'
inputs:
script: './build.cmd Restore --skip'
script: 'dotnet tool restore && dotnet fallout Restore --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -239,7 +239,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Compile'
inputs:
script: './build.cmd Compile --skip'
script: 'dotnet tool restore && dotnet fallout Compile --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -274,7 +274,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Test'
inputs:
script: './build.cmd Test --skip --partition $(System.JobPositionInPhase)/2'
script: 'dotnet tool restore && dotnet fallout Test --skip --partition $(System.JobPositionInPhase)/2'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down Expand Up @@ -307,7 +307,7 @@ stages:
- task: CmdLine@2
displayName: 'Run: Coverage'
inputs:
script: './build.cmd Coverage --skip'
script: 'dotnet tool restore && dotnet fallout Coverage --skip'
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
ApiKey: $(ApiKey)
Expand Down
Loading