From 313102ba3071b586101d3b661cb1f016cb0894b7 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Thu, 20 Jul 2023 13:51:25 +0200 Subject: [PATCH 1/4] Add CI leg to test strict indentation --- azure-pipelines.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d6e1282dd8..c797cadb8ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -347,6 +347,33 @@ stages: ArtifactType: Container parallel: true + - job: WindowsStrictIndentation + pool: + # The PR build definition sets this variable: + # WindowsMachineQueueName=Windows.vs2022.amd64.open + # and there is an alternate build definition that sets this to a queue that is always scouting the + # next preview of Visual Studio. + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals $(WindowsMachineQueueName) + timeoutInMinutes: 120 + steps: + - checkout: self + clean: true + + - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags=--strict-indentation+ + displayName: Build + + - task: PublishBuildArtifacts@1 + displayName: Publish Build BinLog + condition: always() + continueOnError: true + inputs: + PathToPublish: '$(Build.SourcesDirectory)\artifacts\log/Release\Build.VisualFSharp.sln.binlog' + ArtifactName: 'Windows Release build binlogs' + ArtifactType: Container + parallel: true + + # Windows With Compressed Metadata - job: WindowsCompressedMetadata variables: From f16626d3ba1b766025d3520b0939b9217394c2ea Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Thu, 20 Jul 2023 14:52:21 +0200 Subject: [PATCH 2/4] Don't remove existing flags --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c797cadb8ed..3ca920c7504 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -360,7 +360,7 @@ stages: - checkout: self clean: true - - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags=--strict-indentation+ + - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags=$(OtherFlags) --strict-indentation+ displayName: Build - task: PublishBuildArtifacts@1 From 2ab2a2bc0a8446142771cde061370f0b4af14bf9 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Thu, 20 Jul 2023 17:15:03 +0200 Subject: [PATCH 3/4] See if quotes work with $OtherFlags --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3ca920c7504..b31c7c3c34c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -360,7 +360,7 @@ stages: - checkout: self clean: true - - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags=$(OtherFlags) --strict-indentation+ + - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags='$(OtherFlags) --strict-indentation+' displayName: Build - task: PublishBuildArtifacts@1 From 7790e9c04179668d1ce63339e2c1ab77abc3af70 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Mon, 24 Jul 2023 12:09:46 +0200 Subject: [PATCH 4/4] Update azure-pipelines.yml Co-authored-by: Tomas Grosup --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b31c7c3c34c..dc78465d2ee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -360,7 +360,7 @@ stages: - checkout: self clean: true - - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:OtherFlags='$(OtherFlags) --strict-indentation+' + - script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation+ displayName: Build - task: PublishBuildArtifacts@1