Skip to content

Remove logic to build and package .img disk images #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Remove logic to build and package .img disk images #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Microsoft.WSLg.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</metadata>
<files>
<file src="Microsoft.WSLg.targets" target="build/Microsoft.WSLg.targets" />
<file src="package/system_x64.img" target="build/native/bin/x64/system.img" />
<file src="package/system_x64.vhd" target="build/native/bin/x64/system.vhd" />
<file src="package/system-debuginfo_x64.tar.gz" target="build/native/bin/x64/system-debuginfo.tar.gz" />
<file src="package/WSLDVCPlugin_x64.dll" target="build/native/bin/x64/WSLDVCPlugin.dll" />
<file src="package/WSLDVCPlugin_x64.pdb" target="build/native/bin/x64/WSLDVCPlugin.pdb" />
<file src="package/system_ARM64.img" target="build/native/bin/arm64/system.img" />
<file src="package/system_ARM64.vhd" target="build/native/bin/arm64/system.vhd" />
<file src="package/system-debuginfo_ARM64.tar.gz" target="build/native/bin/arm64/system-debuginfo.tar.gz" />
<file src="package/WSLDVCPlugin_ARM64.dll" target="build/native/bin/arm64/WSLDVCPlugin.dll" />
Expand Down
4 changes: 0 additions & 4 deletions Microsoft.WSLg.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)native\bin\$(Platform)\system.img">
<Link>system.img</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)native\bin\$(Platform)\system.vhd">
<Link>system.vhd</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
45 changes: 0 additions & 45 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,6 @@ stages:
artifact: 'system_x64.vhd'
publishLocation: 'pipeline'

- task: Go@0
inputs:
command: 'custom'
customCommand: 'run'
arguments: 'tar2ext4.go -i $(Agent.BuildDirectory)/system_x64.tar -o $(Agent.BuildDirectory)/system_x64.img'
workingDirectory: 'hcsshim/cmd/tar2ext4'
displayName: 'Create system_x64.img'

- task: PublishPipelineArtifact@1
displayName: 'Publish system_x64.img artifact'
inputs:
targetPath: $(Agent.BuildDirectory)/system_x64.img
artifact: 'system_x64.img'
publishLocation: 'pipeline'

- task: PublishPipelineArtifact@1
displayName: 'Publish system-debuginfo_x64.tar.gz artifact'
inputs:
Expand Down Expand Up @@ -234,22 +219,6 @@ stages:
artifact: 'system_arm64.vhd'
publishLocation: 'pipeline'

- task: Go@0
inputs:
command: 'custom'
customCommand: 'run'
arguments: 'tar2ext4.go -i $(Agent.BuildDirectory)/system_arm64.tar -o $(Agent.BuildDirectory)/system_arm64.img'
workingDirectory: 'hcsshim/cmd/tar2ext4'
displayName: 'Create system_arm64.img'

- task: PublishPipelineArtifact@1
displayName: 'Publish system_arm64.img artifact'
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
inputs:
targetPath: $(Agent.BuildDirectory)/system_arm64.img
artifact: 'system_arm64.img'
publishLocation: 'pipeline'

- script: mkdir ./dev &&
~/.docker/cli-plugins/docker-buildx build -f ./wslg/Dockerfile
--output type=tar,dest=./dev/dev_build.tar
Expand Down Expand Up @@ -339,13 +308,6 @@ stages:
artifactName: 'system_x64.vhd'
targetPath: 'package/'

- task: DownloadPipelineArtifact@2
displayName: 'Download system_x64.img'
inputs:
buildType: 'current'
artifactName: 'system_x64.img'
targetPath: 'package/'

- task: DownloadPipelineArtifact@2
displayName: 'Download system-debuginfo_x64.tar.gz'
inputs:
Expand Down Expand Up @@ -374,13 +336,6 @@ stages:
artifactName: 'system_arm64.vhd'
targetPath: 'package/'

- task: DownloadPipelineArtifact@2
displayName: 'Download system_arm64.img'
inputs:
buildType: 'current'
artifactName: 'system_arm64.img'
targetPath: 'package/'

- task: DownloadPipelineArtifact@2
displayName: 'Download system-debuginfo_arm64.tar.gz'
inputs:
Expand Down