From 0619924e730fe9b061ccea5b847570f9dfe4fc98 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 7 Dec 2017 14:19:33 -0800 Subject: [PATCH 1/3] Add linux-arm tar package to release build --- .../Images/GenericLinuxFiles/PowerShellPackage.ps1 | 9 ++++++++- tools/releaseBuild/build.json | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 index 9b18349222f..da7edf3211b 100644 --- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 +++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 @@ -12,7 +12,7 @@ param ( [ValidateNotNullOrEmpty()] [string]$ReleaseTag, - [ValidateSet("AppImage", "tar")] + [ValidateSet("AppImage", "tar", "tar-arm")] [string[]]$ExtraPackage ) @@ -37,6 +37,13 @@ try { "AppImage" { Start-PSPackage -Type AppImage @releaseTagParam } "tar" { Start-PSPackage -Type tar @releaseTagParam } } + + if ($ExtraPackage -contains "tar-arm") { + ## Build 'linux-arm' and create 'tar.gz' package for it. + ## Note that 'linux-arm' can only be built on Ubuntu environment. + Start-PSBuild -Clean -Runtime linux-arm -PSModuleRestore + Start-PSPackage -Type tar-arm @releaseTagParam + } } finally { diff --git a/tools/releaseBuild/build.json b/tools/releaseBuild/build.json index cdeddbc0e37..a7ee5c9fd3d 100644 --- a/tools/releaseBuild/build.json +++ b/tools/releaseBuild/build.json @@ -113,7 +113,7 @@ { "Name": "ubuntu.14.04", "RepoDestinationPath": "/PowerShell", - "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -ExtraPackage AppImage", + "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -ExtraPackage AppImage,tar,tar-arm", "BuildDockerOptions": [ "--cap-add", "SYS_ADMIN", @@ -140,7 +140,7 @@ { "Name": "centos.7", "RepoDestinationPath": "/PowerShell", - "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -ExtraPackage tar", + "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_", "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"], "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_centos7/Dockerfile", "DockerImageName": "ps-centos-7", From ebf1a4eb2d80220a7c7b9b0fdb818110fe91c8d3 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 7 Dec 2017 14:42:33 -0800 Subject: [PATCH 2/3] Minor fix --- .../releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 index da7edf3211b..1cc2211289f 100644 --- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 +++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 @@ -41,7 +41,7 @@ try { if ($ExtraPackage -contains "tar-arm") { ## Build 'linux-arm' and create 'tar.gz' package for it. ## Note that 'linux-arm' can only be built on Ubuntu environment. - Start-PSBuild -Clean -Runtime linux-arm -PSModuleRestore + Start-PSBuild -Runtime linux-arm -PSModuleRestore Start-PSPackage -Type tar-arm @releaseTagParam } } From f618fa6d37efd11d0e9519cf75a67a896c4e07f9 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 8 Dec 2017 11:38:53 -0800 Subject: [PATCH 3/3] Address comment --- .../releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 index 1cc2211289f..80f6a92f869 100644 --- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 +++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 @@ -41,7 +41,7 @@ try { if ($ExtraPackage -contains "tar-arm") { ## Build 'linux-arm' and create 'tar.gz' package for it. ## Note that 'linux-arm' can only be built on Ubuntu environment. - Start-PSBuild -Runtime linux-arm -PSModuleRestore + Start-PSBuild -Runtime linux-arm -PSModuleRestore @releaseTagParam Start-PSPackage -Type tar-arm @releaseTagParam } }