Skip to content

Commit 6468490

Browse files
authored
Merge pull request actions#64 from actions/v-mazhuk/fix-powerhell-issue-with-paths
Fix PowerShell issue with relative paths
2 parents ac42875 + 4be9a4c commit 6468490

File tree

7 files changed

+19
-8
lines changed

7 files changed

+19
-8
lines changed

azure-pipelines/templates/build-job.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,17 @@ jobs:
77
steps:
88
- checkout: self
99
submodules: true
10-
10+
11+
# We need this temporary step to have a consistent version of PowerShell on all images.
12+
- task: PowerShell@2
13+
displayName: 'Update PowerShell version for macOS'
14+
condition: eq(variables['Platform'], 'darwin')
15+
inputs:
16+
TargetType: inline
17+
script: |
18+
brew update
19+
brew cask upgrade powershell
20+
1121
- task: PowerShell@2
1222
displayName: 'Build Python $(VERSION)'
1323
inputs:

azure-pipelines/templates/test-job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
archiveFilePatterns: '$(Build.BinariesDirectory)/python-$(VERSION)-$(Platform)-$(Architecture).*'
2828
destinationFolder: $(Build.BinariesDirectory)
2929
cleanDestinationFolder: false
30+
overwriteExistingFiles: true
3031

3132
- task: PowerShell@2
3233
displayName: 'Apply build artifact to the local machines'

builders/build-python.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using module "./builders/win-python-builder.psm1"
2-
using module "./builders/ubuntu-python-builder.psm1"
3-
using module "./builders/macos-python-builder.psm1"
1+
using module "./win-python-builder.psm1"
2+
using module "./ubuntu-python-builder.psm1"
3+
using module "./macos-python-builder.psm1"
44

55
<#
66
.SYNOPSIS

builders/macos-python-builder.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using module "./builders/nix-python-builder.psm1"
1+
using module "./nix-python-builder.psm1"
22

33
class macOSPythonBuilder : NixPythonBuilder {
44
<#

builders/nix-python-builder.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using module "./builders/python-builder.psm1"
1+
using module "./python-builder.psm1"
22

33
class NixPythonBuilder : PythonBuilder {
44
<#

builders/ubuntu-python-builder.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using module "./builders/nix-python-builder.psm1"
1+
using module "./nix-python-builder.psm1"
22

33
class UbuntuPythonBuilder : NixPythonBuilder {
44
<#

builders/win-python-builder.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using module "./builders/python-builder.psm1"
1+
using module "./python-builder.psm1"
22

33
class WinPythonBuilder : PythonBuilder {
44
<#

0 commit comments

Comments
 (0)