libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #738 from libgd/features/macos_ci 

enable test and let fix them on MacOs action
master
Pierre Joye 2021-08-26 16:43:30 +07:00 committed by GitHub
parent ebf067ea64 1d6c1460df
commit d34c931cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/scripts/removemono.sh vendored Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh -x
[ "${SUDO_USER}" -a `id -u` -eq 0 ] || {
\sudo ${0}
\rm -f ${0}
exit $?
}
\rm -r /Library/Frameworks/Mono.framework
\rm -r /Library/Receipts/MonoFramework-*
for dir in /usr/bin /usr/share/man/man1 /usr/share/man/man3 /usr/share/man/man5; do
(
for i in $(\find ${dir} -type l -maxdepth 1 | \grep /Mono.framework/ | \awk '{print $NF}'); do
echo \rm ${i}
done
)
done
\rm -f ${0}
exit 0

23
.github/workflows/ci_master.yml vendored
View File

@ -70,7 +70,7 @@ jobs:
- name: Install macOS dependencies
if: contains(matrix.os, 'macos')
run: |
brew install libheif libjpeg-turbo freetype libtiff libimagequant libde265 x265 webp
brew install libheif libjpeg-turbo libimagequant libde265 x265
- name: Prepare macOS environment
if: contains(matrix.os, 'macos')
@ -78,11 +78,18 @@ jobs:
sudo xcode-select --switch /Library/Developer/CommandLineTools/
echo "JOBS=$(sysctl -n hw.logicalcpu)" >> $GITHUB_ENV
echo "PKG_CONFIG_PATH=/usr/local/opt/jpeg-turbo/lib/pkgconfig" >> $GITHUB_ENV
echo "CFLAGS=-I/opt/X11/include" >> $GITHUB_ENV
echo "CPATH=/usr/local/include:/usr/local/lib:/usr/local/include/libpng16:/usr/local/opt/openssl/include" >> $GITHUB_ENV
echo "C_INCLUDE_PATH=/usr/local/lib:/usr/local/include/libpng16:/usr/local/opt/openssl/include" >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/local/lib:/usr/local/include/libpng:/usr/local/opt/openssl/include" >> $GITHUB_ENV
echo "LD_PATH"
echo "CFLAGS=-I/opt/X11/include -I/usr/local/Cellar/libpng/1.6.37/include/libpng16" >> $GITHUB_ENV
echo "LDFLAGS=-L/usr/local/Cellar/libpng/1.6.37/lib" >> $GITHUB_ENV
echo "CPATH=/usr/local/include:/usr/local/Cellar/libpng/1.6.37/include/libpng16" >> $GITHUB_ENV
echo "C_INCLUDE_PATH=/usr/local/lib:/usr/local/Cellar/libpng/1.6.37/include/libpng16:/usr/local/opt/openssl/include" >> $GITHUB_ENV
echo "LIBRARY_PATH=/usr/local/Cellar/libpng/1.6.37/lib:/usr/local/lib" >> $GITHUB_ENV
pkg-config --libs --cflags libpng
pkg-config --libs libpng
pkg-config --libs --cflags libpng16
pkg-config --libs libpng16
ls /usr/local/Cellar/libpng/1.6.37/
ls /usr/local/Cellar/libpng/1.6.37/lib/
${{github.workspace}}/.github/scripts/removemono.sh
- name: Configure CMake MacOS
if: contains(matrix.os, 'macos')
@ -90,7 +97,7 @@ jobs:
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -DENABLE_PNG=1 -DENABLE_FREETYPE=1 -DENABLE_JPEG=1 -DENABLE_WEBP=1
-DENABLE_TIFF=1 -DENABLE_GD_FORMATS=1 -DENABLE_CPP=0 -DENABLE_HEIF=1 -D CMAKE_PREFIX_PATH=/usr/local
-DBUILD_TEST=1 -DVERBOSE_MAKEFILE=1 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-DBUILD_TEST=1 -DVERBOSE_MAKEFILE=1 -DPNG_PNG_INCLUDE_DIR=/usr/local/Cellar/libpng/1.6.37/include -DPNG_PNG_LIBRARY_DIR=/usr/local/Cellar/libpng/1.6.37/lib -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Install Dependencies Windows
if: contains(matrix.os, 'Windows')
@ -120,7 +127,7 @@ jobs:
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4
- name: Test Ubuntu
if: contains(matrix.os, 'ubuntu')
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
working-directory: ${{github.workspace}}/build
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail