diff options
| -rw-r--r-- | .github/workflows/build.yml | 89 | ||||
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 20 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
4 files changed, 51 insertions, 64 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12de8c7..a685bb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,75 +6,73 @@ concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.ref }} cancel-in-progress: true -permissions: read-all - jobs: Ubuntu: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Build Ubuntu run: | - ./configure --with-fastfloat - make + ./configure --with-fastfloat --with-threaded + make make check Ubuntu-20-04: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Build Ubuntu run: | - ./configure --with-fastfloat - make + ./configure --with-fastfloat --with-threaded + make make check - + MacOS: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Build MacOS run: | - ./configure --with-fastfloat - make - make check - + ./configure --with-fastfloat --with-threaded + make + make check + Windows-64: runs-on: windows-latest - + steps: - - uses: actions/checkout@v3 - - uses: ilammy/msvc-dev-cmd@v1 + - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 - - - name: Build Windows 64 bit - run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|x64" /Project testbed - - - name: Run tests + + - name: Build Windows 64 bit + run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|x64" /Project testbed + + - name: Run tests run: testbed\testbed.exe --chdir testbed - + Windows-32: - runs-on: windows-latest + runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: ilammy/msvc-dev-cmd@v1 + - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 with: arch: win32 + + - name: Build Windows 32 bit + run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|Win32" /Project testbed - - name: Build Windows 32 bit - run: devenv .\Projects\VC2019\lcms2.sln /Rebuild "Release|Win32" /Project testbed - - - name: Run tests + - name: Run tests run: testbed\testbed.exe --chdir testbed - - + + Ubuntu-meson: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Install packages run: | @@ -83,7 +81,7 @@ jobs: - name: Build Ubuntu run: | - meson setup build -Dfastfloat=true + meson setup build -Dfastfloat=true -Dthreaded=true meson compile -C build meson test -C build @@ -91,7 +89,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Install packages run: | @@ -104,8 +102,8 @@ jobs: meson compile -C build meson test -C build - msys2-meson: - name: 'msys2-meson ${{ matrix.sys }} ${{ matrix.library }}' + msys-meson: + name: 'msys-meson ${{ matrix.sys.abi }} ${{ matrix.library }}' runs-on: windows-latest defaults: run: @@ -113,26 +111,25 @@ jobs: strategy: matrix: sys: - - mingw32 - - mingw64 - - ucrt64 - - clang32 - - clang64 + - { abi: mingw32, env: i686, compiler: gcc } + - { abi: mingw64, env: x86_64, compiler: gcc } + - { abi: ucrt64, env: ucrt-x86_64, compiler: gcc } + - { abi: clang32, env: clang-i686, compiler: clang } + - { abi: clang64, env: clang-x86_64, compiler: clang } library: ['shared', 'static'] fail-fast: false steps: - name: Use MinGW from MSYS uses: msys2/setup-msys2@v2 with: - msystem: ${{matrix.sys}} + msystem: ${{matrix.sys.abi}} update: true pacboy: >- - cc:p + toolchain:p meson:p ninja:p - pkgconf:p - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 - name: Build Windows run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9fcddf6..37da696 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,16 +14,10 @@ on: schedule: - cron: '0 6 * * 5' -permissions: read-all - jobs: analyze: name: Analyze runs-on: ubuntu-latest - permissions: - actions: read # for github/codeql-action/init to get workflow details - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/autobuild to send a status report strategy: fail-fast: false @@ -36,7 +30,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -44,23 +38,23 @@ jobs: # If this run was triggered by a pull request event, then checkout # the head of the pull request instead of the merge commit. - #- run: git checkout HEAD^2 - # if: ${{ github.event_name == 'pull_request' }} + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. + # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v1 # âšī¸ Command-line programs to run using the OS shell. # đ https://git.io/JvXDl @@ -74,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v1 diff --git a/meson.build b/meson.build index 91152f8..f049200 100644 --- a/meson.build +++ b/meson.build @@ -100,10 +100,7 @@ deps = [m_dep, threads_dep] subdir('include') subdir('src') subdir('testbed') - -if get_option('utils') - subdir('utils') -endif +subdir('utils') if get_option('samples') subdir('utils/samples') diff --git a/meson_options.txt b/meson_options.txt index ae41f38..5adc464 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,5 @@ option('jpeg', type: 'feature', value: 'auto', description: 'Use JPEG') option('tiff', type: 'feature', value: 'auto', description: 'Use LibTiff') option('samples', type: 'boolean', value: 'false', description: 'Build the samples') -option('utils', type: 'boolean', value: 'true', description: 'Build the utils') option('fastfloat', type: 'boolean', value: 'false', description: 'Build and install the fast float plugin, use only if GPL 3.0 is acceptable') option('threaded', type: 'boolean', value: 'false', description: 'Build and install the multi threaded plugin, use only if GPL 3.0 is acceptable') |