Skip to content
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.

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

Support compiling against Musl #3188

Merged
merged 2 commits into from May 12, 2024
Merged

Conversation

simonjbeaumont
Copy link
Contributor

@simonjbeaumont simonjbeaumont commented May 8, 2024

These changes are now available in 4.99.2

Vapor already makes some provision for compiling against Musl in the RFC1123 implementation, where Glibc is not assumed and is imported conditionally alongside a conditional import of Musl. However, there are a couple of other places where Glibc is still assumed when compiling for Linux.

This patch replaces these imports with the same #if canImport(...) pattern.

Vapor already makes some provision for compiling against Musl in the
RFC1123 implementation, where `Glibc` is not assumed and is imported
conditionally alongside a conditional import of `Musl`. However, there
are a couple of other places where `Glibc` is still assumed when
compiling for Linux.

This patch replaces these imports with the same `#if canImport(...)`
pattern.
Copy link
Member

@0xTim 0xTim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@0xTim
Copy link
Member

0xTim commented May 9, 2024

Waiting on vapor/console-kit#198 to discuss if we can test this in CI

@0xTim 0xTim added the semver-patch Internal changes only label May 9, 2024
Copy link

codecov bot commented May 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.23%. Comparing base (11cdb29) to head (f5ad38f).
Report is 20 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3188      +/-   ##
==========================================
+ Coverage   76.86%   77.23%   +0.36%     
==========================================
  Files         211      210       -1     
  Lines        8119     8044      -75     
==========================================
- Hits         6241     6213      -28     
+ Misses       1878     1831      -47     
Files Coverage Δ
...urces/Vapor/Utilities/DirectoryConfiguration.swift 92.59% <ø> (-0.96%) ⬇️
Sources/Vapor/Utilities/DotEnv.swift 92.35% <ø> (-1.28%) ⬇️

... and 93 files with indirect coverage changes

@0xTim 0xTim enabled auto-merge (squash) May 12, 2024 22:34
@0xTim 0xTim merged commit d9fa0d3 into vapor:main May 12, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver-patch Internal changes only
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants