From 8b9eab093b6e98e1a08f52f660ed4b1776f68612 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 19 Jun 2023 09:41:39 +0800 Subject: [PATCH] keep symlinks in maven package (#16376) ### Description 1. Keep symlink in the package. 2. keep the artifact package format ### Motivation and Context --- .../templates/mac-cpu-packaging-pipeline.yml | 27 ++++++++++++++++--- .../templates/mac-cpu-packaging-steps.yml | 5 ++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml index 1f908927e6..080079388a 100644 --- a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-pipeline.yml @@ -79,7 +79,7 @@ stages: StepName: 'Download Pipeline onnxruntime-osx-x86_64' ArtifactName: 'onnxruntime-osx-x86_64' TargetPath: '$(Build.ArtifactStagingDirectory)' - SpecificArtifact: ${{ parameters.specificArtifact }} + SpecificArtifact: ${{ parameters.SpecificArtifact }} BuildId: ${{ parameters.BuildId }} - ${{ if eq(parameters.BuildForAllArchs, true) }}: @@ -88,26 +88,45 @@ stages: StepName: 'Download Pipeline onnxruntime-osx-arm64' ArtifactName: 'onnxruntime-osx-arm64' TargetPath: '$(Build.ArtifactStagingDirectory)' - SpecificArtifact: ${{ parameters.specificArtifact }} + SpecificArtifact: ${{ parameters.SpecificArtifact }} BuildId: ${{ parameters.BuildId }} - template: flex-downloadPipelineArtifact.yml parameters: StepName: 'Download Pipeline onnxruntime-osx-universal2' ArtifactName: 'onnxruntime-osx-universal2' TargetPath: '$(Build.ArtifactStagingDirectory)' - SpecificArtifact: ${{ parameters.specificArtifact }} + SpecificArtifact: ${{ parameters.SpecificArtifact }} BuildId: ${{ parameters.BuildId }} - ${{ if eq(parameters.DoESRP, true)}}: + - script: | + pushd '$(Build.ArtifactStagingDirectory)' + find . '*.tgz' -exec tar -zxvf {} \; + rm -f *.tgz; + find . -type d -name 'onnxruntime-osx-*' -exec zip -FSr --symlinks {}.zip {} \; + find . -type d -name 'onnxruntime-osx-*' -exec rm -rf {} \; + ls -l + popd + displayName: tgz to zip - template: mac-esrp-dylib.yml parameters: FolderPath: '$(Build.ArtifactStagingDirectory)' DisplayName: 'ESRP - Sign Mac' DoEsrp: true Pattern: '*.zip' + - script: | + pushd '$(Build.ArtifactStagingDirectory)' + find . '*.zip' -exec unzip {} \; + rm -f *.zip; + find . -type d -name 'onnxruntime-osx-*' -exec tar -czf {}.tgz {} \; + find . -type d -name 'onnxruntime-osx-*' -exec rm -rf {} \; + ls -l + popd + displayName: zip to tgz - bash: | set -ex - find $(Build.ArtifactStagingDirectory) -name "*.zip" -exec unzip {} -d $(Agent.TempDirectory)/macpackage \; + mkdir -p $(Agent.TempDirectory)/macpackage + find $(Build.ArtifactStagingDirectory) -name "*.tgz" -exec tar -zxvf {} -C $(Agent.TempDirectory)/macpackage \; find $(Agent.TempDirectory)/macpackage -name "*.dylib" -exec codesign -dvvv {} \; find $(Agent.TempDirectory)/macpackage -name "*.dylib" -exec ls -l {} \; rm -rf $(Agent.TempDirectory)/macpackage diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-steps.yml b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-steps.yml index 1a188839cc..0cb77e222a 100644 --- a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-steps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-steps.yml @@ -68,8 +68,9 @@ steps: inputs: rootFolderOrFile: '$(Build.BinariesDirectory)/onnxruntime-osx-${{ parameters.MacosArch }}-$(OnnxRuntimeVersion)' includeRootFolder: true - archiveType: 'zip' # Options: zip, 7z, tar, wim - archiveFile: '$(Build.ArtifactStagingDirectory)/onnxruntime-osx-${{ parameters.MacosArch }}-$(OnnxRuntimeVersion).zip' + archiveType: 'tar' # Options: zip, 7z, tar, wim + tarCompression: 'gz' + archiveFile: '$(Build.ArtifactStagingDirectory)/onnxruntime-osx-${{ parameters.MacosArch }}-$(OnnxRuntimeVersion).tgz' replaceExistingArchive: true - script: |