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.

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

Jump to bottom

Xplat alpine changes #1094

Merged
merged 12 commits into from
Feb 20, 2020
Merged

Xplat alpine changes #1094

merged 12 commits into from
Feb 20, 2020

Conversation

david-puglielli
Copy link
Contributor

No description provided.

@coveralls
Copy link

coveralls commented Feb 12, 2020 •
edited
Loading

Coverage Status

Coverage increased (+0.8%) to 74.501% when pulling 01a0fba on david-puglielli:xplat-alpine-changes into 9534f7b on microsoft:dev.

@codecov
Copy link

codecov bot commented Feb 12, 2020 •
edited
Loading

Codecov Report

Merging #1094 into dev will decrease coverage by 0.08%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev    #1094      +/-   ##
==========================================
- Coverage   77.19%   77.11%   -0.09%     
==========================================
  Files          25       25              
  Lines        7440     7440              
==========================================
- Hits         5743     5737       -6     
- Misses       1697     1703       +6
Impacted Files Coverage Δ
.../x86/php-7.4.2-src/ext/sqlsrv/shared/core_stmt.cpp 83.61% <0%> (-0.61%) ⬇️

yitam
yitam suggested changes Feb 12, 2020
View reviewed changes
Copy link
Contributor

@yitam yitam left a comment

Choose a reason for hiding this comment

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

With uname -n you should get alpine without parsing?

Also, Alpine Linux is very popular for Docker testing or development, so using uname alone may not suffice. Please add the check of /etc/*release (or /etc/os-release) as well

@david-puglielli
Copy link
Contributor Author

uname -n gives the hostname, which could be anything. But I'll add a check of os-release.

yitam
yitam reviewed Feb 19, 2020
View reviewed changes
source/pdo_sqlsrv/config.m4
IS_ALPINE_2=`cat /etc/os-release | grep ID | grep alpine | cut -f 2 -d '='`
if test "${IS_ALPINE_1}" = "Alpine" || test "${IS_ALPINE_2}" = "alpine"; then
AC_DEFINE(__MUSL__, 1, [ ])
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

Forgot to mention that perhaps you can first check uname and if it's Darwin simply skips?

@yitam yitam merged commit cd64173 into microsoft:dev Feb 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yitam yitam yitam approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@david-puglielli @coveralls @yitam