diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2021-08-29 14:45:59 +0700 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2021-08-29 14:45:59 +0700 |
| commit | ca9c1e7da7284fecb2df11f62614835155e5cd80 (patch) | |
| tree | 1a2377601a018357c4f33bcf06c0551311a394d2 /.github | |
| parent | 22a16ab62461a69cdedd110b1156070530df1792 (diff) | |
| download | libgd-ca9c1e7da7284fecb2df11f62614835155e5cd80.tar.gz | |
simplify matrix
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci_ubuntu.yml | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 24adaec..1e9026c 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -15,25 +15,20 @@ env: jobs: CI: + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - config: - - { - name: "Ubuntu Latest GCC", - os: ubuntu-latest, - cc: "gcc", cxx: "g++" - } - - { - name: "Ubuntu Latest Clang", - os: ubuntu-latest, - cc: "clang", cxx: "clang++" - } - name: ${ { matrix.config.name } } - runs-on: ${ { matrix.config.os } } + cc: + - gcc + - clang + cxx: + - g++" + - clang++ + name: ${{ matrix.arch }} defaults: run: - shell: bash + shell: bash steps: - name: Checkout code @@ -60,8 +55,8 @@ jobs: - name: Configure CMake env: - CC: ${{ matrix.config.cc }} - CXX: ${{ matrix.config.cxx }}) + CC: ${{ matrix.cc }} + CXX: ${{ matrix.cxx }} 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 @@ -70,7 +65,7 @@ jobs: - name: Build env: CC: ${{ matrix.cc }} - CXX: ${{ matrix.cxx }}) + CXX: ${{ matrix.cxx }} # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4 @@ -84,8 +79,8 @@ jobs: - name: Configure CMake ASAN Ubuntu env: - CC: ${{ matrix.config.cc }} - CXX: ${{ matrix.config.cxx }}) + CC: ${{ matrix.cc }} + CXX: ${{ matrix.cxx }} 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 @@ -93,8 +88,8 @@ jobs: - name: Build ASAN Ubuntu env: - CC: ${{ matrix.config.cc }} - CXX: ${{ matrix.config.cxx }}) + CC: ${{ matrix.cc }} + CXX: ${{ matrix.cxx }} run: cmake --build ${{github.workspace}}/buildasan --config ${{env.BUILD_TYPE}} - name: Test ASAN Ubuntu |