Skip to content

Conversation

@akoeplinger
Copy link
Member

@akoeplinger akoeplinger commented Feb 7, 2022

Backport of #64628 to release/6.0

/cc @lewing @radical

Customer Impact

During the dotnet/runtime build Emscripten would download and cache zlib sources for wasm builds that set USE_ZLIB=1. As we saw in #62553 this can lead the failures if that download fails and also introduces an unnecessary dependency that we can avoid since we already have the sources in the repo.

Note: in main the zlib sources were refactored to not be in a Windows-specific folder path, but for release/6.0 including them from the Windows-specific path is less churn.

Testing

Manual and CI testing.

Risk

Low. We're replacing the zlib sources that emscripten downloads with the (identical) sources we already have in the repo.

@ghost
Copy link

ghost commented Feb 7, 2022

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@ghost ghost assigned akoeplinger Feb 7, 2022
@akoeplinger akoeplinger added the Servicing-consider Issue for next servicing release review label Feb 7, 2022
@akoeplinger akoeplinger added this to the 6.0.x milestone Feb 7, 2022
@akoeplinger akoeplinger marked this pull request as ready for review February 7, 2022 16:15
@akoeplinger akoeplinger requested review from lewing and radical and removed request for marek-safar February 7, 2022 16:15
@akoeplinger akoeplinger changed the title [wasm] Remove USE_ZLIB=1 and include the sources instead [release/6.0][wasm] Remove USE_ZLIB=1 and include the sources instead Feb 7, 2022
@leecow leecow removed the Servicing-consider Issue for next servicing release review label Feb 10, 2022
@leecow leecow modified the milestones: 6.0.x, 6.0.3 Feb 10, 2022
@danmoseley
Copy link
Member

Does this mean src/mono/mono/zlib/* are dead? If so there's an advantage in deleting them, because they are still scanned for hypothetical future vulnerabilities etc.

@lewing
Copy link
Member

lewing commented Feb 10, 2022

Does this mean src/mono/mono/zlib/* are dead? If so there's an advantage in deleting them, because they are still scanned for hypothetical future vulnerabilities etc.

Unfortunately I believe that is yet another zlib.

@danmoseley
Copy link
Member

Ah, I see it was cleaned up in main already. 0e499ac

@lewing lewing added the Servicing-approved Approved for servicing release label Feb 11, 2022
@safern
Copy link
Member

safern commented Feb 11, 2022

@mmitche this PR was marked as 6.0.3 on yesterday's tactics meeting, should we still merge it?

@safern safern merged commit a5a0004 into dotnet:release/6.0 Feb 11, 2022
@akoeplinger akoeplinger deleted the zlib-6.0 branch February 11, 2022 23:33
@ghost ghost locked as resolved and limited conversation to collaborators Mar 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Build-mono Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants