From b322860745a73b7e1c433564895c4daf94c501d2 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 21 Jun 2024 11:52:07 +0900 Subject: [PATCH] infra/workflow: includes the gl engine build test. --- .github/workflows/build_android.yml | 10 +++++----- .github/workflows/build_ios.yml | 4 ++-- .github/workflows/build_macos.yml | 8 ++++---- .github/workflows/build_ubuntu.yml | 25 +++++++------------------ .github/workflows/build_windows.yml | 8 ++++---- .github/workflows/regression.yml | 3 +-- 6 files changed, 23 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index a6befd9b..612032cd 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -23,7 +23,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo pip3 install meson ninja + sudo apt-get install meson ninja-build libgles-dev - name: Build env: @@ -31,7 +31,7 @@ jobs: API: 21 run: | sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_x86_64.txt > /tmp/android_cross.txt - meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" --cross-file /tmp/android_cross.txt + meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true --cross-file /tmp/android_cross.txt sudo ninja -C build install - uses: actions/upload-artifact@v4 @@ -53,7 +53,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo pip3 install meson ninja + sudo apt-get install meson ninja-build libgles-dev - name: Build env: @@ -61,10 +61,10 @@ jobs: API: 21 run: | sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_aarch64.txt > /tmp/android_cross.txt - meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" --cross-file /tmp/android_cross.txt + meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true --cross-file /tmp/android_cross.txt sudo ninja -C build install - uses: actions/upload-artifact@v4 with: name: result_aarch64 - path: build/src/libthorvg* \ No newline at end of file + path: build/src/libthorvg* diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml index 236bc046..43cdb257 100644 --- a/.github/workflows/build_ios.yml +++ b/.github/workflows/build_ios.yml @@ -30,7 +30,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./cross/ios_x86_64.txt + meson setup build -Dlog=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true --cross-file ./cross/ios_x86_64.txt ninja -C build install - uses: actions/upload-artifact@v4 @@ -59,7 +59,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./cross/ios_aarch64.txt + meson setup build -Dlog=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dstatic=true --cross-file ./cross/ios_aarch64.txt ninja -C build install - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index ea3bc848..b0e89295 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -30,10 +30,10 @@ jobs: - name: Build run: | - meson setup build -Dlog=true -Dexamples=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" + meson setup build -Dlog=true -Dexamples=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dtools=all ninja -C build install - static_loaders: + compact_test: runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -53,7 +53,7 @@ jobs: - name: Build run: | - meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" -Dstatic=true + meson setup build -Dlog=true -Dloaders=all -Dsavers=all -Dstatic=true -Dthreads=false ninja -C build install unit_test: @@ -76,7 +76,7 @@ jobs: - name: Build run: | - meson setup build -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs + meson setup build -Dloaders=all -Dsavers=all -Dbindings=capi -Dtests=true --errorlogs ninja -C build install test - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 83315a12..1cbdf6fc 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -19,18 +19,14 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install ninja-build gcc-multilib g++-multilib libunwind-dev - sudo apt-get install libefl-all-dev - sudo apt-get install python3-pip - sudo apt-get install libturbojpeg0-dev libpng-dev libwebp-dev - sudo pip3 install meson + sudo apt-get install meson ninja-build libturbojpeg0-dev libpng-dev libwebp-dev libgles-dev libsdl2-dev - name: Build run: | - meson setup build -Dlog=true -Dexamples=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" + meson setup build -Dlog=true -Dengines=all -Dexamples=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dtools=all sudo ninja -C build install - static_loaders: + compact_test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -40,13 +36,11 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install ninja-build gcc-multilib g++-multilib - sudo apt-get install python3-pip - sudo pip3 install meson + sudo apt-get install meson ninja-build libgles-dev - name: Build run: | - meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" -Dstatic=true + meson setup build -Dlog=true -Dengines=all -Dloaders=all -Dsavers=all -Dstatic=true -Dthreads=false sudo ninja -C build install unit_test: @@ -59,16 +53,11 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install ninja-build gcc-multilib g++-multilib libgtest-dev cmake cmake-data libasan5 valgrind - sudo apt-get install curl jq - sudo apt-get install software-properties-common - sudo apt-get install python3-pip - sudo apt-get install libturbojpeg0-dev libpng-dev libwebp-dev - sudo pip3 install meson + sudo apt-get install meson ninja-build libgtest-dev libasan5 valgrind curl jq software-properties-common libturbojpeg0-dev libpng-dev libwebp-dev libgles-dev - name: Build run: | - meson setup build -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs + meson setup build -Dloaders="all" -Dengines=all -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs sudo ninja -C build install test - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 4e75c361..8589fcfd 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -21,7 +21,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" + meson setup build -Dlog=true -Dloaders=all -Dsavers=all -Dbindings=capi -Dtools=all where link ninja -C build install @@ -30,7 +30,7 @@ jobs: name: result_windows path: build/src/thorvg* - static_loaders: + compact_test: runs-on: windows-latest steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtools="all" -Dstatic=true + meson setup build -Dlog=true -Dloaders=all -Dsavers=all -Dstatic=true -Dthreads=false where link ninja -C build install @@ -63,7 +63,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dloaders="all" -Dsavers="all" -Dbindings="capi" -Dtests=true --errorlogs + meson setup build -Dloaders=all -Dsavers=all -Dbindings=capi -Dtests=true --errorlogs where link ninja -C build install test diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 2fdeb41a..d5eb6ad7 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -14,8 +14,7 @@ jobs: - name: Install things run: | sudo apt-get update - sudo apt-get install -y wget2 librsvg2-dev librsvg2-bin ninja-build git gcc-multilib g++-multilib earlyoom - sudo pip3 install meson + sudo apt-get install -y meson wget2 librsvg2-dev librsvg2-bin ninja-build git gcc-multilib g++-multilib earlyoom - name: Compile Thorvg PR run: |