Skip to content

Commit b363e08

Browse files
committed
Use correct path sep. for macOS notarize step
Use the correct path separator in the macOS build YAML for notarizing the installer pkg file and containing binaries.
1 parent 7b0fbbe commit b363e08

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.azure-pipelines/templates/osx/pack.signed/step3-pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ steps:
2424
- task: PublishPipelineArtifact@0
2525
displayName: Upload unsigned package
2626
inputs:
27-
artifactName: 'tmp.macpkg_unsigned'
27+
artifactName: 'tmp.macinstaller_unsigned'
2828
targetPath: '$(Build.StagingDirectory)/pkg/gcmcore-osx-$(GitBuildVersion).pkg'

.azure-pipelines/templates/osx/pack.signed/step4-signpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ steps:
88
displayName: Download unsigned package
99
inputs:
1010
buildType: 'current'
11-
artifactName: 'tmp.macpkg_unsigned'
11+
artifactName: 'tmp.macinstaller_unsigned'
1212
downloadPath: '$(Build.StagingDirectory)\pkg'
1313

1414
- powershell: |

.azure-pipelines/templates/osx/pack.signed/step5-dist.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@ steps:
44
inputs:
55
buildType: 'current'
66
artifactName: 'tmp.macinstaller_signed'
7-
downloadPath: '$(Build.StagingDirectory)\pkg'
7+
downloadPath: '$(Build.StagingDirectory)/pkg'
88

99
- task: DownloadPipelineArtifact@1
1010
displayName: Download signed payload
1111
inputs:
1212
buildType: 'current'
1313
artifactName: 'tmp.macpayload_signed'
14-
downloadPath: '$(Build.StagingDirectory)\payload'
14+
downloadPath: '$(Build.StagingDirectory)/payload'
1515

1616
- task: DownloadPipelineArtifact@1
1717
displayName: Download symbols
1818
inputs:
1919
buildType: 'current'
2020
artifactName: 'tmp.macsymbols'
21-
downloadPath: '$(Build.StagingDirectory)\symbols'
21+
downloadPath: '$(Build.StagingDirectory)/symbols'
2222

23-
- script: src/osx/SignFiles.Mac/notarize-pkg.sh -id "$(AppleId)" -p "$(AppleIdPassword)" -pkg '$(Build.StagingDirectory)\pkg\*.pkg'
23+
- script: src/osx/SignFiles.Mac/notarize-pkg.sh -id "$(AppleId)" -p "$(AppleIdPassword)" -pkg "$(Build.StagingDirectory)"/pkg/*.pkg
2424
displayName: Notarize and staple installer package
2525

2626
- script: |
27-
cp "$(Build.StagingDirectory)/pkg/*.pkg" "$(Build.StagingDirectory)/publish/"
28-
cp "$(Build.StagingDirectory)/payload" "$(Build.StagingDirectory)/publish/payload/"
29-
cp "$(Build.StagingDirectory)/symbols" "$(Build.StagingDirectory)/publish/payload.sym/"
27+
mkdir -p "$(Build.StagingDirectory)/publish/payload" "$(Build.StagingDirectory)/publish/payload.sym"
28+
cp -f "$(Build.StagingDirectory)"/pkg/*.pkg "$(Build.StagingDirectory)/publish/"
29+
cp -Rf "$(Build.StagingDirectory)/payload/" "$(Build.StagingDirectory)/publish/payload/"
30+
cp -Rf "$(Build.StagingDirectory)/symbols/" "$(Build.StagingDirectory)/publish/payload.sym/"
3031
displayName: Prepare final build artifact
3132
3233
- task: PublishPipelineArtifact@0

src/osx/SignFiles.Mac/notarize-pkg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [[ -z $arg_Password ]]; then
7575
exit 1
7676
fi
7777

78-
if [[ ! -f "$arg_PackagePath" ]]; then
78+
if [[ ! -f $arg_PackagePath ]]; then
7979
echo "[ERROR] Must supply valid / non-empty path to package!"
8080
exit 1
8181
fi

0 commit comments

Comments
 (0)