From fef2ab9f85f1884c3c35a4bef9ce03d356589173 Mon Sep 17 00:00:00 2001 From: MaksimZhukov <46996400+MaksimZhukov@users.noreply.github.com> Date: Thu, 23 Apr 2020 14:56:51 +0300 Subject: [PATCH 1/8] Update versions-manifest based on build from 20200423.15 (#5) Co-authored-by: Service account --- versions-manifest.json | 152 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 versions-manifest.json diff --git a/versions-manifest.json b/versions-manifest.json new file mode 100644 index 0000000..af1fc39 --- /dev/null +++ b/versions-manifest.json @@ -0,0 +1,152 @@ +[ + { + "version": "14.0.0", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/14.0.0-20200423.15", + "files": [ + { + "filename": "node-14.0.0-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/14.0.0-20200423.15/node-14.0.0-darwin-x64.zip" + }, + { + "filename": "node-14.0.0-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/14.0.0-20200423.15/node-14.0.0-linux-x64.zip" + }, + { + "filename": "node-14.0.0-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/14.0.0-20200423.15/node-14.0.0-win32-x64.zip" + } + ] + }, + { + "version": "13.13.0", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/13.13.0-20200423.14", + "files": [ + { + "filename": "node-13.13.0-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/13.13.0-20200423.14/node-13.13.0-darwin-x64.zip" + }, + { + "filename": "node-13.13.0-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/13.13.0-20200423.14/node-13.13.0-linux-x64.zip" + }, + { + "filename": "node-13.13.0-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/13.13.0-20200423.14/node-13.13.0-win32-x64.zip" + } + ] + }, + { + "version": "12.16.2", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/12.16.2-20200423.13", + "files": [ + { + "filename": "node-12.16.2-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/12.16.2-20200423.13/node-12.16.2-darwin-x64.zip" + }, + { + "filename": "node-12.16.2-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/12.16.2-20200423.13/node-12.16.2-linux-x64.zip" + }, + { + "filename": "node-12.16.2-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/12.16.2-20200423.13/node-12.16.2-win32-x64.zip" + } + ] + }, + { + "version": "10.20.1", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/10.20.1-20200423.12", + "files": [ + { + "filename": "node-10.20.1-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/10.20.1-20200423.12/node-10.20.1-darwin-x64.zip" + }, + { + "filename": "node-10.20.1-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/10.20.1-20200423.12/node-10.20.1-linux-x64.zip" + }, + { + "filename": "node-10.20.1-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/10.20.1-20200423.12/node-10.20.1-win32-x64.zip" + } + ] + }, + { + "version": "8.17.0", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/8.17.0-20200423.11", + "files": [ + { + "filename": "node-8.17.0-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/8.17.0-20200423.11/node-8.17.0-darwin-x64.zip" + }, + { + "filename": "node-8.17.0-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/8.17.0-20200423.11/node-8.17.0-linux-x64.zip" + }, + { + "filename": "node-8.17.0-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/8.17.0-20200423.11/node-8.17.0-win32-x64.zip" + } + ] + }, + { + "version": "6.17.1", + "stable": true, + "release_url": "https://github.com/actions/node-versions/releases/tag/6.17.1-20200423.10", + "files": [ + { + "filename": "node-6.17.1-darwin-x64.zip", + "arch": "x64", + "platform": "darwin", + "download_url": "https://github.com/actions/node-versions/releases/download/6.17.1-20200423.10/node-6.17.1-darwin-x64.zip" + }, + { + "filename": "node-6.17.1-linux-x64.zip", + "arch": "x64", + "platform": "linux", + "download_url": "https://github.com/actions/node-versions/releases/download/6.17.1-20200423.10/node-6.17.1-linux-x64.zip" + }, + { + "filename": "node-6.17.1-win32-x64.zip", + "arch": "x64", + "platform": "win32", + "download_url": "https://github.com/actions/node-versions/releases/download/6.17.1-20200423.10/node-6.17.1-win32-x64.zip" + } + ] + } +] -- 2.49.1 From 956838a10b17c723b23aae6ad8f9a82980f8c3c1 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 17:44:34 +0300 Subject: [PATCH 2/8] Switch to tar.gz --- azure-pipelines/templates/build-job.yml | 10 +--------- builders/nix-node-builder.psm1 | 11 ++++++++--- builders/node-builder.psm1 | 12 +++++++++--- builders/win-node-builder.psm1 | 13 +++++++++---- helpers/nix-helpers.psm1 | 13 +++++++++++++ helpers/win-helpers.psm1 | 16 +++++++++++++++- 6 files changed, 55 insertions(+), 20 deletions(-) diff --git a/azure-pipelines/templates/build-job.yml b/azure-pipelines/templates/build-job.yml index db625d8..4cd5923 100644 --- a/azure-pipelines/templates/build-job.yml +++ b/azure-pipelines/templates/build-job.yml @@ -14,16 +14,8 @@ jobs: filePath: './builders/build-node.ps1' arguments: '-Version $(Version) -Platform $(Platform) -Architecture $(Architecture)' - - task: ArchiveFiles@2 - displayName: 'Archive artifact' - inputs: - rootFolderOrFile: '$(Build.BinariesDirectory)' - archiveType: zip - includeRootFolder: false - archiveFile: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip' - - task: PublishPipelineArtifact@1 displayName: 'Publish Artifact: Node.js $(Version)' inputs: - targetPath: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip' + targetPath: '$(Build.ArtifactStagingDirectory)' artifactName: 'node-$(Version)-$(Platform)-$(Architecture)' \ No newline at end of file diff --git a/builders/nix-node-builder.psm1 b/builders/nix-node-builder.psm1 index c56cd80..470d710 100644 --- a/builders/nix-node-builder.psm1 +++ b/builders/nix-node-builder.psm1 @@ -27,7 +27,7 @@ class NixNodeBuilder : NodeBuilder { ) : Base($version, $platform, $architecture) { $this.InstallationTemplateName = "nix-setup-template.sh" $this.InstallationScriptName = "setup.sh" - $this.OutputArtifactName = "tool.tar.gz" + $this.OutputArtifactName = "node-$Version-$Platform-$Architecture.tar.gz" } [uri] GetBinariesUri() { @@ -41,7 +41,7 @@ class NixNodeBuilder : NodeBuilder { } [void] ExtractBinaries($archivePath) { - Extract-TarArchive -ArchivePath $archivePath -OutputDirectory $this.ArtifactLocation + Extract-TarArchive -ArchivePath $archivePath -OutputDirectory $this.WorkFolderLocation } [void] CreateInstallationScript() { @@ -50,7 +50,7 @@ class NixNodeBuilder : NodeBuilder { Create Node.js artifact installation script based on template specified in InstallationTemplateName property. #> - $installationScriptLocation = New-Item -Path $this.ArtifactLocation -Name $this.InstallationScriptName -ItemType File + $installationScriptLocation = New-Item -Path $this.WorkFolderLocation -Name $this.InstallationScriptName -ItemType File $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw @@ -59,4 +59,9 @@ class NixNodeBuilder : NodeBuilder { Write-Debug "Done; Installation script location: $installationScriptLocation)" } + + [void] ArchiveArtifact() { + $OutputPath = Join-Path $this.ArtifactFolderLocation $this.OutputArtifactName + Create-TarArchive -SourceFolder $this.WorkFolderLocation -ArchivePath $OutputPath + } } diff --git a/builders/node-builder.psm1 b/builders/node-builder.psm1 index 21ef28f..d3688c9 100644 --- a/builders/node-builder.psm1 +++ b/builders/node-builder.psm1 @@ -30,7 +30,8 @@ class NodeBuilder { [string] $Platform [string] $Architecture [string] $TempFolderLocation - [string] $ArtifactLocation + [string] $WorkFolderLocation + [string] $ArtifactFolderLocation [string] $InstallationTemplatesLocation NodeBuilder ([version] $version, [string] $platform, [string] $architecture) { @@ -38,8 +39,10 @@ class NodeBuilder { $this.Platform = $platform $this.Architecture = $architecture - $this.ArtifactLocation = $env:BUILD_BINARIESDIRECTORY - $this.TempFolderLocation = $env:BUILD_STAGINGDIRECTORY + $this.TempFolderLocation = [IO.Path]::GetTempPath() + $this.WorkFolderLocation = $env:BUILD_BINARIESDIRECTORY + $this.ArtifactFolderLocation = $env:BUILD_STAGINGDIRECTORY + $this.InstallationTemplatesLocation = Join-Path -Path $PSScriptRoot -ChildPath "../installers" } @@ -89,5 +92,8 @@ class NodeBuilder { Write-Host "Create installation script..." $this.CreateInstallationScript() + + Write-Host "Archive artifact" + $this.ArchiveArtifact() } } diff --git a/builders/win-node-builder.psm1 b/builders/win-node-builder.psm1 index 0246b26..97c40d3 100644 --- a/builders/win-node-builder.psm1 +++ b/builders/win-node-builder.psm1 @@ -27,7 +27,7 @@ class WinNodeBuilder : NodeBuilder { ) : Base($version, $platform, $architecture) { $this.InstallationTemplateName = "win-setup-template.ps1" $this.InstallationScriptName = "setup.ps1" - $this.OutputArtifactName = "tool.7z" + $this.OutputArtifactName = "node-$Version-$Platform-$Architecture.zip" } [uri] GetBinariesUri() { @@ -42,9 +42,9 @@ class WinNodeBuilder : NodeBuilder { [void] ExtractBinaries($archivePath) { $extractTargetDirectory = Join-Path $this.TempFolderLocation "tempExtract" - Extract-7ZipArchive -ArchivePath $archivePath -OutputDirectory $extractTargetDirectory + Extract-SevenZipArchive -ArchivePath $archivePath -OutputDirectory $extractTargetDirectory $nodeOutputPath = Get-Item $extractTargetDirectory\* | Select-Object -First 1 -ExpandProperty Fullname - Move-Item -Path $nodeOutputPath\* -Destination $this.ArtifactLocation + Move-Item -Path $nodeOutputPath\* -Destination $this.WorkFolderLocation } [void] CreateInstallationScript() { @@ -53,7 +53,7 @@ class WinNodeBuilder : NodeBuilder { Create Node.js artifact installation script based on specified template. #> - $installationScriptLocation = New-Item -Path $this.ArtifactLocation -Name $this.InstallationScriptName -ItemType File + $installationScriptLocation = New-Item -Path $this.WorkFolderLocation -Name $this.InstallationScriptName -ItemType File $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw @@ -66,4 +66,9 @@ class WinNodeBuilder : NodeBuilder { $installationTemplateContent | Out-File -FilePath $installationScriptLocation Write-Debug "Done; Installation script location: $installationScriptLocation)" } + + [void] ArchiveArtifact() { + $OutputPath = Join-Path $this.ArtifactFolderLocation $this.OutputArtifactName + Create-SevenZipArchive -SourceFolder $this.WorkFolderLocation -ArchivePath $OutputPath + } } diff --git a/helpers/nix-helpers.psm1 b/helpers/nix-helpers.psm1 index 6c5bdb4..65e5857 100644 --- a/helpers/nix-helpers.psm1 +++ b/helpers/nix-helpers.psm1 @@ -12,5 +12,18 @@ function Extract-TarArchive { Write-Debug "Extract $ArchivePath to $OutputDirectory" tar -C $OutputDirectory -xzf $ArchivePath --strip 1 +} +function Create-TarArchive { + param( + [Parameter(Mandatory=$true)] + [String]$SourceFolder, + [Parameter(Mandatory=$true)] + [String]$ArchivePath, + [string]$CompressionType = "gz" + ) + + $CompressionArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" } + + tar -c $CompressionArgument -f $ArchivePath "$SourceFolder\*.*" } \ No newline at end of file diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1 index 9520fbd..710669c 100644 --- a/helpers/win-helpers.psm1 +++ b/helpers/win-helpers.psm1 @@ -2,7 +2,7 @@ .SYNOPSIS Unpack *.7z file #> -function Extract-7ZipArchive { +function Extract-SevenZipArchive { param( [Parameter(Mandatory=$true)] [String]$ArchivePath, @@ -12,4 +12,18 @@ function Extract-7ZipArchive { Write-Debug "Extract $ArchivePath to $OutputDirectory" 7z x $ArchivePath -o"$OutputDirectory" -y | Out-Null +} + +function Create-SevenZipArchive { + param( + [Parameter(Mandatory=$true)] + [String]$SourceFolder, + [Parameter(Mandatory=$true)] + [String]$ArchivePath, + [String]$ArchiveType = "zip" + ) + + $ArchiveTypeArgument = "-t${ArchiveType}" + + 7z a $ArchiveTypeArgument $ArchivePath "$SourceFolder\*.*" -r } \ No newline at end of file -- 2.49.1 From 10e3a2416f32b52f1799f40281599ddd9a952306 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 17:48:09 +0300 Subject: [PATCH 3/8] fix parameters of unpack function --- helpers/nix-helpers.psm1 | 2 +- helpers/win-helpers.psm1 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/helpers/nix-helpers.psm1 b/helpers/nix-helpers.psm1 index 65e5857..793c869 100644 --- a/helpers/nix-helpers.psm1 +++ b/helpers/nix-helpers.psm1 @@ -25,5 +25,5 @@ function Create-TarArchive { $CompressionArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" } - tar -c $CompressionArgument -f $ArchivePath "$SourceFolder\*.*" + tar -c $CompressionArgument -f $ArchivePath "$SourceFolder/*.*" } \ No newline at end of file diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1 index 710669c..e98f64a 100644 --- a/helpers/win-helpers.psm1 +++ b/helpers/win-helpers.psm1 @@ -25,5 +25,7 @@ function Create-SevenZipArchive { $ArchiveTypeArgument = "-t${ArchiveType}" - 7z a $ArchiveTypeArgument $ArchivePath "$SourceFolder\*.*" -r + Push-Location $SourceFolder + 7z a $ArchiveTypeArgument $ArchivePath *.* -r + Pop-Location } \ No newline at end of file -- 2.49.1 From 7e2965c731fa0b09495018ed6bc194f22f3cb594 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 17:57:57 +0300 Subject: [PATCH 4/8] fix zip parameters --- azure-pipelines/templates/test-job.yml | 2 +- helpers/nix-helpers.psm1 | 5 +++-- helpers/win-helpers.psm1 | 9 ++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml index 4c88389..a33cf43 100644 --- a/azure-pipelines/templates/test-job.yml +++ b/azure-pipelines/templates/test-job.yml @@ -25,7 +25,7 @@ jobs: - task: ExtractFiles@1 inputs: - archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).zip' + archiveFilePatterns: '$(Build.ArtifactStagingDirectory)/node-$(Version)-$(Platform)-$(Architecture).*' destinationFolder: $(Build.BinariesDirectory) cleanDestinationFolder: false diff --git a/helpers/nix-helpers.psm1 b/helpers/nix-helpers.psm1 index 793c869..b8ed743 100644 --- a/helpers/nix-helpers.psm1 +++ b/helpers/nix-helpers.psm1 @@ -23,7 +23,8 @@ function Create-TarArchive { [string]$CompressionType = "gz" ) - $CompressionArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" } + $CompressionTypeArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" } - tar -c $CompressionArgument -f $ArchivePath "$SourceFolder/*.*" + Write-Debug "tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder" + tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder } \ No newline at end of file diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1 index e98f64a..1f6d319 100644 --- a/helpers/win-helpers.psm1 +++ b/helpers/win-helpers.psm1 @@ -20,12 +20,15 @@ function Create-SevenZipArchive { [String]$SourceFolder, [Parameter(Mandatory=$true)] [String]$ArchivePath, - [String]$ArchiveType = "zip" + [String]$ArchiveType = "zip", + [String]$CompressionLevel = 5 ) $ArchiveTypeArgument = "-t${ArchiveType}" - + $CompressionLevelArgument = "-mx=${CompressionLevel}" + Push-Location $SourceFolder - 7z a $ArchiveTypeArgument $ArchivePath *.* -r + Write-Debug "7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder" + 7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder Pop-Location } \ No newline at end of file -- 2.49.1 From 4335ada9f6fa8b33514041bbeed436cf5c56f786 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 18:02:29 +0300 Subject: [PATCH 5/8] Update test-job.yml --- azure-pipelines/templates/test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml index a33cf43..d823162 100644 --- a/azure-pipelines/templates/test-job.yml +++ b/azure-pipelines/templates/test-job.yml @@ -8,7 +8,7 @@ jobs: submodules: true - task: PowerShell@2 - displayName: Fully cleanup the toolcache directory + displayName: Fully cleanup the toolcache directory before testing inputs: TargetType: inline script: | -- 2.49.1 From 59d4db4007ab67e191638ab73e002bf86238a169 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 18:06:12 +0300 Subject: [PATCH 6/8] Fix archive parameters --- azure-pipelines/templates/test-job.yml | 2 ++ helpers/nix-helpers.psm1 | 6 ++++-- helpers/win-helpers.psm1 | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml index d823162..72258cf 100644 --- a/azure-pipelines/templates/test-job.yml +++ b/azure-pipelines/templates/test-job.yml @@ -34,6 +34,8 @@ jobs: inputs: targetType: inline script: | + $pwd + Get-ChildItem if ("$(Platform)" -match 'win32') { powershell ./setup.ps1 } else { sh ./setup.sh } workingDirectory: '$(Build.BinariesDirectory)' diff --git a/helpers/nix-helpers.psm1 b/helpers/nix-helpers.psm1 index b8ed743..e6e3441 100644 --- a/helpers/nix-helpers.psm1 +++ b/helpers/nix-helpers.psm1 @@ -25,6 +25,8 @@ function Create-TarArchive { $CompressionTypeArgument = If ([string]::IsNullOrWhiteSpace($CompressionType)) { "" } else { "--${CompressionType}" } - Write-Debug "tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder" - tar -c $CompressionTypeArgument -f $ArchivePath $SourceFolder + Push-Location $SourceFolder + Write-Debug "tar -c $CompressionTypeArgument -f $ArchivePath ." + tar -c $CompressionTypeArgument -f $ArchivePath . + Pop-Location } \ No newline at end of file diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1 index 1f6d319..c816c35 100644 --- a/helpers/win-helpers.psm1 +++ b/helpers/win-helpers.psm1 @@ -29,6 +29,6 @@ function Create-SevenZipArchive { Push-Location $SourceFolder Write-Debug "7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder" - 7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder + 7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath $SourceFolder Pop-Location } \ No newline at end of file -- 2.49.1 From 555a12c47c025654a2a6a1659060ec58bf863490 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 18:14:31 +0300 Subject: [PATCH 7/8] fix structure of zip archive --- helpers/win-helpers.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/win-helpers.psm1 b/helpers/win-helpers.psm1 index c816c35..74a16f3 100644 --- a/helpers/win-helpers.psm1 +++ b/helpers/win-helpers.psm1 @@ -29,6 +29,6 @@ function Create-SevenZipArchive { Push-Location $SourceFolder Write-Debug "7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath @$SourceFolder" - 7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath $SourceFolder + 7z a $ArchiveTypeArgument $CompressionLevelArgument $ArchivePath $SourceFolder\* Pop-Location } \ No newline at end of file -- 2.49.1 From 64469f777cd928bff06dec20d6853c28a69e7030 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Thu, 23 Apr 2020 18:26:10 +0300 Subject: [PATCH 8/8] remove debug output --- azure-pipelines/templates/test-job.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/azure-pipelines/templates/test-job.yml b/azure-pipelines/templates/test-job.yml index 72258cf..d823162 100644 --- a/azure-pipelines/templates/test-job.yml +++ b/azure-pipelines/templates/test-job.yml @@ -34,8 +34,6 @@ jobs: inputs: targetType: inline script: | - $pwd - Get-ChildItem if ("$(Platform)" -match 'win32') { powershell ./setup.ps1 } else { sh ./setup.sh } workingDirectory: '$(Build.BinariesDirectory)' -- 2.49.1