whoever thought inventing a language in yaml needs a life...

1 files changed, 78 insertions, 86 deletions

diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml
index a40c078..1f45d3e 100644
--- a/.github/workflows/ci_ubuntu.yml
+++ b/.github/workflows/ci_ubuntu.yml
@@ -41,14 +41,6 @@ jobs:
               cflags: "-march=armv8.2-a+fp16+rcpc+dotprod+crypto+sve -mtune=neoverse-n1"
             }
 
-#           - {
-#              name: "Ubuntu Graviton Clang",
-#              os: [self-hosted, Linux, ARM64, graviton],
-#              cc: "clang-12",
-#              cxx: "clang-cpp-12"
-#            }
-
-
     name: ${{ matrix.config.name }}
     defaults:
       run:
@@ -87,82 +79,82 @@ jobs:
           echo $CXX
           echo $CFLAGS
 
-       - name: Configure CMake Clang
-        if: contains(matrix.config.cc, 'clang')
-        env:
-          CC: ${{ matrix.config.cc }}
-          CXX: ${{ matrix.config.cxx }}
-          CFLAGS: ${{ matrix.config.cflags }}
-        run:
-           cmake  -G "Unix Makefiles" -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}}
-          -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/cmake/modules/linux-clang.cmake
-
-      - name: Configure CMake gcc
-        if: contains(matrix.config.cc, 'gcc')
-        env:
-          CC: ${{ matrix.config.cc }}
-          CXX: ${{ matrix.config.cxx }}
-          CFLAGS: ${{ matrix.config.cflags }}
-        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: Build
-        env:
-          CC: ${{ matrix.config.cc }}
-          CXX: ${{ matrix.config.cxx }}
-          CFLAGS: ${{ matrix.config.cflags }}
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4
-
-      - name: Test
-        if: contains(matrix.config.cc, 'gcc')
-        working-directory: ${{github.workspace}}/build
-        run: |
-          export TMP=${{runner.temp}}
-          echo "TMP=${{github.temp}}" >> $GITHUB_ENV
-          echo "LSAN_OPTIONS=suppressions=${{ github.workspace }}/suppressions/lsan.supp" >> $GITHUB_ENV
-          CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}}
-
-      - name: Configure CMake ASAN
-        env:
-          CC: ${{ matrix.config.cc }}
-          CXX: ${{ matrix.config.cxx }}
-          CFLAGS: ${{ matrix.config.cflags }}
-        if: contains(matrix.config.cc, 'gcc')
-        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}}/buildasan -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-      - name: Build ASAN
-        if: contains(matrix.config.cc, 'gcc')
-        env:
-          CC: ${{ matrix.config.cc }}
-          CXX: ${{ matrix.config.cxx }}
-          CFLAGS: "-march=armv8.2-a+fp16+rcpc+dotprod+crypto -mtune=neoverse-n1"
-        run: cmake --build ${{github.workspace}}/buildasan --config ${{env.BUILD_TYPE}}
-
-      - name: Test ASAN
-        if: contains(matrix.config.cc, 'gcc')
-        working-directory: ${{github.workspace}}/buildasan
-        run: |
-          export TMP=${{runner.temp}}
-          echo "TMP=${{github.temp}}" >> $GITHUB_ENV
-          CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}}
-
-      - name: Configure and Make
-        working-directory: ${{github.workspace}}/
-        run: |
-          ./bootstrap.sh
-          ./configure --with-png --with-jpeg --with-ramq --with-heif --with-xpm --with-tiff --with-webp --with-liq --enable-gd --enable-gd-formats --with-zlib
-          make
-          make dist
-
-      - name: Output Log
-        run: |
-          if test -f "/home/runner/work/libgd/libgd/build/Testing/Temporary/LastTest.log"; then
+        - name: Configure CMake Clang
+          if: contains(matrix.config.cc, 'clang')
+          env:
+            CC: ${{ matrix.config.cc }}
+            CXX: ${{ matrix.config.cxx }}
+            CFLAGS: ${{ matrix.config.cflags }}
+          run:
+            cmake  -G "Unix Makefiles" -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}}
+            -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/cmake/modules/linux-clang.cmake
+
+        - name: Configure CMake gcc
+          if: contains(matrix.config.cc, 'gcc')
+          env:
+            CC: ${{ matrix.config.cc }}
+            CXX: ${{ matrix.config.cxx }}
+            CFLAGS: ${{ matrix.config.cflags }}
+          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: Build
+          env:
+            CC: ${{ matrix.config.cc }}
+            CXX: ${{ matrix.config.cxx }}
+            CFLAGS: ${{ matrix.config.cflags }}
+          run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 4
+
+        - name: Test
+          if: contains(matrix.config.cc, 'gcc')
+          working-directory: ${{github.workspace}}/build
+          run: |
+            export TMP=${{runner.temp}}
+            echo "TMP=${{github.temp}}" >> $GITHUB_ENV
+            echo "LSAN_OPTIONS=suppressions=${{ github.workspace }}/suppressions/lsan.supp" >> $GITHUB_ENV
+            CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}}
+
+        - name: Configure CMake ASAN
+          env:
+            CC: ${{ matrix.config.cc }}
+            CXX: ${{ matrix.config.cxx }}
+            CFLAGS: ${{ matrix.config.cflags }}
+          if: contains(matrix.config.cc, 'gcc')
+          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}}/buildasan -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+        - name: Build ASAN
+          if: contains(matrix.config.cc, 'gcc')
+          env:
+            CC: ${{ matrix.config.cc }}
+            CXX: ${{ matrix.config.cxx }}
+            CFLAGS: "-march=armv8.2-a+fp16+rcpc+dotprod+crypto -mtune=neoverse-n1"
+          run: cmake --build ${{github.workspace}}/buildasan --config ${{env.BUILD_TYPE}}
+
+        - name: Test ASAN
+          if: contains(matrix.config.cc, 'gcc')
+          working-directory: ${{github.workspace}}/buildasan
+          run: |
+            export TMP=${{runner.temp}}
+            echo "TMP=${{github.temp}}" >> $GITHUB_ENV
+            CTEST_OUTPUT_ON_FAILURE=1 ctest -C ${{env.BUILD_TYPE}}
+
+        - name: Configure and Make
+          working-directory: ${{github.workspace}}/
+          run: |
+            ./bootstrap.sh
+            ./configure --with-png --with-jpeg --with-ramq --with-heif --with-xpm --with-tiff --with-webp --with-liq --enable-gd --enable-gd-formats --with-zlib
+            make
+            make dist
+
+        - name: Output Log
+          run: |
+            if test -f "/home/runner/work/libgd/libgd/build/Testing/Temporary/LastTest.log"; then
               cat /home/runner/work/libgd/libgd/build/Testing/Temporary/LastTest.log
-          fi
+            fi