From 1be0d6bdc410e646002b9b7365b7a8dd195bed6a Mon Sep 17 00:00:00 2001
From: SteveGilham <SteveGilham@users.noreply.github.com>
Date: Mon, 18 Dec 2023 12:24:28 +0000
Subject: [PATCH] Pre-empt the next PR
---
Build/actions.fs | 9 ++-------
Build/targets.fs | 11 +++++++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Build/actions.fs b/Build/actions.fs
index 3ad21eae..2c3ab89a 100644
--- a/Build/actions.fs
+++ b/Build/actions.fs
@@ -401,16 +401,11 @@ using System.Runtime.CompilerServices;
let AssertResult (msg: string) (result: Fake.Core.ProcessResult<'a>) =
Assert.That(result.ExitCode, Is.EqualTo 0, msg)
- let Run (file, dir, (args:string seq)) msg =
+ let Run (file, dir, (args: string seq)) msg =
printfn "Actions.Run %A on %A with %A" file dir args
args |> Seq.iter (printfn "%A")
- CreateProcess.fromRawCommand
- file
- (if isNull args then
- Seq.empty<string>
- else
- args)
+ CreateProcess.fromRawCommand file args
|> CreateProcess.withWorkingDirectory dir
|> CreateProcess.withFramework
|> Proc.run
diff --git a/Build/targets.fs b/Build/targets.fs
index dd57fda8..6c5b44aa 100644
--- a/Build/targets.fs
+++ b/Build/targets.fs
@@ -1544,10 +1544,13 @@ module Targets =
if
Environment.isWindows
- && "GITHUB_RUN_NUMBER"
- |> (Environment.environVar
- >> String.IsNullOrWhiteSpace
- >> not)
+ && [ "GITHUB_RUN_NUMBER"
+ "COVERALLS_REPO_TOKEN" ]
+ |> List.forall (
+ Environment.environVar
+ >> String.IsNullOrWhiteSpace
+ >> not
+ )
then
let maybe envvar fallback =
let x = Environment.environVar envvar