Skip to content

Commit 962425f

Browse files
authored
Merge pull request #1103 from microsoft/remove-img
Remove logic to build and package .img disk images
2 parents 0ae64bd + 37e7bc1 commit 962425f

File tree

3 files changed

+0
-51
lines changed

3 files changed

+0
-51
lines changed

Microsoft.WSLg.nuspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2020
</metadata>
2121
<files>
2222
<file src="Microsoft.WSLg.targets" target="build/Microsoft.WSLg.targets" />
23-
<file src="package/system_x64.img" target="build/native/bin/x64/system.img" />
2423
<file src="package/system_x64.vhd" target="build/native/bin/x64/system.vhd" />
2524
<file src="package/system-debuginfo_x64.tar.gz" target="build/native/bin/x64/system-debuginfo.tar.gz" />
2625
<file src="package/WSLDVCPlugin_x64.dll" target="build/native/bin/x64/WSLDVCPlugin.dll" />
2726
<file src="package/WSLDVCPlugin_x64.pdb" target="build/native/bin/x64/WSLDVCPlugin.pdb" />
28-
<file src="package/system_ARM64.img" target="build/native/bin/arm64/system.img" />
2927
<file src="package/system_ARM64.vhd" target="build/native/bin/arm64/system.vhd" />
3028
<file src="package/system-debuginfo_ARM64.tar.gz" target="build/native/bin/arm64/system-debuginfo.tar.gz" />
3129
<file src="package/WSLDVCPlugin_ARM64.dll" target="build/native/bin/arm64/WSLDVCPlugin.dll" />

Microsoft.WSLg.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
66
-->
77
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
88
<ItemGroup>
9-
<None Include="$(MSBuildThisFileDirectory)native\bin\$(Platform)\system.img">
10-
<Link>system.img</Link>
11-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12-
</None>
139
<None Include="$(MSBuildThisFileDirectory)native\bin\$(Platform)\system.vhd">
1410
<Link>system.vhd</Link>
1511
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

azure-pipelines.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,6 @@ stages:
8989
artifact: 'system_x64.vhd'
9090
publishLocation: 'pipeline'
9191

92-
- task: Go@0
93-
inputs:
94-
command: 'custom'
95-
customCommand: 'run'
96-
arguments: 'tar2ext4.go -i $(Agent.BuildDirectory)/system_x64.tar -o $(Agent.BuildDirectory)/system_x64.img'
97-
workingDirectory: 'hcsshim/cmd/tar2ext4'
98-
displayName: 'Create system_x64.img'
99-
100-
- task: PublishPipelineArtifact@1
101-
displayName: 'Publish system_x64.img artifact'
102-
inputs:
103-
targetPath: $(Agent.BuildDirectory)/system_x64.img
104-
artifact: 'system_x64.img'
105-
publishLocation: 'pipeline'
106-
10792
- task: PublishPipelineArtifact@1
10893
displayName: 'Publish system-debuginfo_x64.tar.gz artifact'
10994
inputs:
@@ -244,22 +229,6 @@ stages:
244229
artifact: 'system_arm64.vhd'
245230
publishLocation: 'pipeline'
246231

247-
- task: Go@0
248-
inputs:
249-
command: 'custom'
250-
customCommand: 'run'
251-
arguments: 'tar2ext4.go -i $(Agent.BuildDirectory)/system_arm64.tar -o $(Agent.BuildDirectory)/system_arm64.img'
252-
workingDirectory: 'hcsshim/cmd/tar2ext4'
253-
displayName: 'Create system_arm64.img'
254-
255-
- task: PublishPipelineArtifact@1
256-
displayName: 'Publish system_arm64.img artifact'
257-
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
258-
inputs:
259-
targetPath: $(Agent.BuildDirectory)/system_arm64.img
260-
artifact: 'system_arm64.img'
261-
publishLocation: 'pipeline'
262-
263232
- script: mkdir ./dev &&
264233
~/.docker/cli-plugins/docker-buildx build -f ./wslg/Dockerfile
265234
--output type=tar,dest=./dev/dev_build.tar
@@ -359,13 +328,6 @@ stages:
359328
artifactName: 'system_x64.vhd'
360329
targetPath: 'package/'
361330

362-
- task: DownloadPipelineArtifact@2
363-
displayName: 'Download system_x64.img'
364-
inputs:
365-
buildType: 'current'
366-
artifactName: 'system_x64.img'
367-
targetPath: 'package/'
368-
369331
- task: DownloadPipelineArtifact@2
370332
displayName: 'Download system-debuginfo_x64.tar.gz'
371333
inputs:
@@ -394,13 +356,6 @@ stages:
394356
artifactName: 'system_arm64.vhd'
395357
targetPath: 'package/'
396358

397-
- task: DownloadPipelineArtifact@2
398-
displayName: 'Download system_arm64.img'
399-
inputs:
400-
buildType: 'current'
401-
artifactName: 'system_arm64.img'
402-
targetPath: 'package/'
403-
404359
- task: DownloadPipelineArtifact@2
405360
displayName: 'Download system-debuginfo_arm64.tar.gz'
406361
inputs:

0 commit comments

Comments
 (0)