Skip to content

Commit

Permalink
Fixes Windows CI: prepend '/c/Program Files/Git/bin' (#2611)
Browse files Browse the repository at this point in the history
* Fixes Windows CI: prepend '/c/Program Files/Git/bin'

Bash@3 started failing after a recent change related to WSL

actions/runner-images#1081
actions/runner-images#1276

* Fix slashes

* Pick bash from env
  • Loading branch information
ManasJayanth authored Jul 26, 2020
1 parent f0873b6 commit d3822b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .ci/build-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']))))
Expand Down
2 changes: 1 addition & 1 deletion miscTests/backportSyntaxTests.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e

echo "Testing the backport of 'letop'"
Expand Down

0 comments on commit d3822b7

Please sign in to comment.