From f82d1e4a9bccda05c0656ce22dcc9dbe135ff0ef Mon Sep 17 00:00:00 2001 From: Manas Date: Wed, 22 Jul 2020 18:43:45 +0530 Subject: [PATCH 1/3] Fixes Windows CI: prepend '/c/Program Files/Git/bin' Bash@3 started failing after a recent change related to WSL https://github.com/actions/virtual-environments/pull/1081 https://github.com/actions/virtual-environments/pull/1276 --- .ci/build-platform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build-platform.yml b/.ci/build-platform.yml index 1354ec972..c86b117db 100644 --- a/.ci/build-platform.yml +++ b/.ci/build-platform.yml @@ -16,10 +16,10 @@ jobs: # Needed so that the mingw tar doesn't shadow the system tar. See # pipelines.yaml. We need windows bsdtar from system32, not the mingw # one. Note powershell doesn't need escaping of backslashes. - - powershell: Write-Host "##vso[task.setvariable variable=PATH;]C:\Windows\system32;${env:PATH}" + - powershell: Write-Host "##vso[task.setvariable variable=PATH;]C:\Program Files\Git\bin;C:\Windows\system32;${env:PATH}" continueOnError: true condition: eq(variables['AGENT.OS'], 'Windows_NT') - displayName: "Make sure windows/system32 is at front of path if windows" + displayName: "Make sure C:\Program Files\Git\bin and windows/system32 is at front of path if windows" - powershell: $Env:Path continueOnError: true condition: and(eq(variables['AGENT.OS'], 'Windows_NT'), and(eq(variables['Build.Reason'], 'PullRequest'), and(succeeded(), ne(variables['Build.SourceBranch'], variables['System.PullRequest.TargetBranch'])))) From 566e6bedb673a00db2822c5ee5b461f1ee5e80c4 Mon Sep 17 00:00:00 2001 From: Manas Date: Wed, 22 Jul 2020 19:16:33 +0530 Subject: [PATCH 2/3] Fix slashes --- .ci/build-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build-platform.yml b/.ci/build-platform.yml index c86b117db..3defe0622 100644 --- a/.ci/build-platform.yml +++ b/.ci/build-platform.yml @@ -19,7 +19,7 @@ jobs: - powershell: Write-Host "##vso[task.setvariable variable=PATH;]C:\Program Files\Git\bin;C:\Windows\system32;${env:PATH}" continueOnError: true condition: eq(variables['AGENT.OS'], 'Windows_NT') - displayName: "Make sure C:\Program Files\Git\bin and windows/system32 is at front of path if windows" + displayName: "Make sure C:/Program Files/Git/bin and windows/system32 is at front of path if windows" - powershell: $Env:Path continueOnError: true condition: and(eq(variables['AGENT.OS'], 'Windows_NT'), and(eq(variables['Build.Reason'], 'PullRequest'), and(succeeded(), ne(variables['Build.SourceBranch'], variables['System.PullRequest.TargetBranch'])))) From cc0966171a4a0dd8eb30ff0edf89040fda1fb5bf Mon Sep 17 00:00:00 2001 From: Manas Date: Wed, 22 Jul 2020 19:48:53 +0530 Subject: [PATCH 3/3] Pick bash from env --- miscTests/backportSyntaxTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miscTests/backportSyntaxTests.sh b/miscTests/backportSyntaxTests.sh index 26d07e742..57dd2d07c 100755 --- a/miscTests/backportSyntaxTests.sh +++ b/miscTests/backportSyntaxTests.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e echo "Testing the backport of 'letop'"