From c5b5ce4334c6be88e70b02553eb8765d7fa2bf7f Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Tue, 31 Aug 2021 10:27:18 +0700 Subject: use this one for MacOs only --- .github/workflows/ci_master.yml | 109 +++------------------------------------- 1 file changed, 6 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci_master.yml b/.github/workflows/ci_master.yml index a5947d6..4b3e6c3 100644 --- a/.github/workflows/ci_master.yml +++ b/.github/workflows/ci_master.yml @@ -19,23 +19,17 @@ jobs: fail-fast: false matrix: name: [ "Linux x64 (Ubuntu 20.04)" ] - os: [ ubuntu-20.04 ] + os: [ macos-latest ] sanitize: [ false ] build: - { shell: bash } include: - - name: "Linux x64 (Ubuntu 20.04)" - os: ubuntu-20.04 - build: { shell: bash } - name: "macOS (10.15) - Xcode 12.3" os: macOS-latest build: { shell: bash } # - name: "macOS (10.15) - Xcode 12.3 - M1" # os: macos-m1 # build: { shell: "/usr/bin/arch -arch arm64e /bin/bash -l {0}" } - - name: "Windows 2019 x64" - os: windows-2019 - build: { shell: powershell } defaults: run: @@ -45,44 +39,12 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Update apt (Ubuntu) - if: contains(matrix.os, 'ubuntu') - env: - DEBIAN_FRONTEND: noninteractive - run: sudo -E apt-get update -qq -o Acquire::Retries=3 - - - name: Add libheif PPA (Ubuntu) - if: contains(matrix.os, 'ubuntu') - run: | - sudo add-apt-repository ppa:strukturag/libde265 - sudo add-apt-repository ppa:strukturag/libheif - - - name: install Ubuntu dependencies - if: contains(matrix.os, 'ubuntu') - env: - DEBIAN_FRONTEND: noninteractive - run: sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3 - libjpeg-turbo8-dev libimagequant-dev libde265-dev - libpng-dev libwebp-dev libtiff5-dev libx265-dev - libheif-dev libfreetype-dev libheif-dev - libavifile-0.7-dev libxpm-dev libraqm-dev - - - name: Configure CMake Ubuntu - if: contains(matrix.os, 'ubuntu') - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # 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_XPM=1 -DENABLE_GD_FORMATS=1 -DENABLE_HEIF=1 -DENABLE_RAQM=1 - -DBUILD_TEST=1 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - - - name: Install macOS dependencies - if: contains(matrix.os, 'macos') + - name: Install dependencies run: | brew install libheif libjpeg-turbo libimagequant libde265 x265 - - name: Prepare macOS environment - if: contains(matrix.os, 'macos') + - name: Prepare environment + run: | sudo xcode-select --switch /Library/Developer/CommandLineTools/ echo "JOBS=$(sysctl -n hw.logicalcpu)" >> $GITHUB_ENV @@ -100,43 +62,18 @@ jobs: ls /usr/local/Cellar/libpng/1.6.37/lib/ ${{github.workspace}}/.github/scripts/removemono.sh - - name: Configure CMake MacOS - if: contains(matrix.os, 'macos') + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # 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 -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}} - - uses: actions/cache@v2 - with: - path: C:\vcpkg\downloads - key: ${{ runner.os }}-vcpkg-download-${{ matrix.os }}-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-vcpkg-download-${{ matrix.os }}- - ${{ runner.os }}-vcpkg-download- - - - name: Install Dependencies Windows - if: contains(matrix.os, 'Windows') - run: | - $Env:VCPKG_DEFAULT_TRIPLET="x64-windows" - C:\vcpkg\vcpkg.exe install libpng libjpeg-turbo freetype tiff libheif libwebp - - - name: Configure CMake Windows x64 - if: contains(matrix.os, 'Windows') - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # 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_GD_FORMATS=1 -DENABLE_TIFF=1 - -DENABLE_HEIF=1 - -DBUILD_TEST=1 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake - - name: Build # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4 - - name: Test Ubuntu - if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos') + - name: Test 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 @@ -146,40 +83,6 @@ jobs: echo "LSAN_OPTIONS=suppressions=${{ github.workspace }}/suppressions/lsan.supp" >> $GITHUB_ENV CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}} - - name: Test Windows - if: contains(matrix.os, 'windows') - 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 - run: | - $Env:TMP=${{github.temp}} - $Env:CTEST_OUTPUT_ON_FAILURE=1 - ctest -C ${{env.BUILD_TYPE}} - - - name: Configure CMake ASAN Ubuntu - if: contains(matrix.os, 'ubuntu') - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # 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_XPM=1 -DENABLE_GD_FORMATS=1 -DENABLE_HEIF=1 - -DBUILD_TEST=1 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - - - name: Build ASAN Ubuntu - if: contains(matrix.os, 'ubuntu') - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - - name: Test ASAN Ubuntu - if: contains(matrix.os, 'ubuntu') - 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 - run: | - export TMP=${{runner.temp}} - echo "TMP=${{github.temp}}" >> $GITHUB_ENV - CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}} - - name: Output Log if: contains(matrix.os, 'ubuntu') run: | -- cgit v1.2.1