diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2022-12-23 11:39:09 -0700 |
|---|---|---|
| committer | Andrew Kaster <andrewdkaster@gmail.com> | 2022-12-25 07:58:58 -0700 |
| commit | 03edff1f393a6e4a857f50023a82eaf11eda4b0d (patch) | |
| tree | 4cc02f8bbcdf2bceff91d274d5f4e45fb4a73767 | |
| parent | 0384513779613b04f55ef305514d7624681aab5d (diff) | |
| download | serenity-03edff1f393a6e4a857f50023a82eaf11eda4b0d.zip | |
CI: Enable ladybird builds in Lagom CI
| -rw-r--r-- | Meta/Azure/Lagom.yml | 23 | ||||
| -rw-r--r-- | Meta/Azure/Setup.yml | 4 |
2 files changed, 21 insertions, 6 deletions
diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml index bbf1f9a609..a57930bcc0 100644 --- a/Meta/Azure/Lagom.yml +++ b/Meta/Azure/Lagom.yml @@ -23,6 +23,18 @@ jobs: ${{ if eq(parameters.fuzzer, 'NoFuzz') }}: value: gcc + - name: host-cc + ${{ if eq(parameters.os, 'macOS') }}: + value: $(brew --prefix llvm@15)/bin/clang + ${{ if not(eq(parameters.os, 'macOS')) }}: + value: gcc-12 + + - name: host-cxx + ${{ if eq(parameters.os, 'macOS') }}: + value: $(brew --prefix llvm@15)/bin/clang++ + ${{ if not(eq(parameters.os, 'macOS')) }}: + value: g++-12 + - name: ndk_version # only relevant for Android value: '24.0.8215888' @@ -55,13 +67,14 @@ jobs: cmake -GNinja -B tools-build \ -DBUILD_LAGOM=OFF \ -DENABLE_LAGOM_CCACHE=ON \ - -DCMAKE_C_COMPILER=gcc-12 \ - -DCMAKE_CXX_COMPILER=g++-12 \ + -DCMAKE_C_COMPILER=$(host-cc) \ + -DCMAKE_CXX_COMPILER=$(host-cxx) \ -DCMAKE_INSTALL_PREFIX=tool-install \ -Dpackage=LagomTools ninja -C tools-build install cmake -GNinja -B Build \ -DBUILD_LAGOM=ON \ + -DENABLE_LAGOM_LADYBIRD=ON \ -DENABLE_LAGOM_CCACHE=ON \ -DBUILD_SHARED_LIBS=OFF \ -DANDROID_ABI=arm64-v8a \ @@ -100,12 +113,13 @@ jobs: cmake -GNinja -B Build \ -DBUILD_LAGOM=ON \ -DENABLE_LAGOM_CCACHE=ON \ + -DENABLE_LAGOM_LADYBIRD=ON \ -DINCLUDE_WASM_SPEC_TESTS=ON \ -DWASM_SPEC_TEST_SKIP_FORMATTING=ON \ -DENABLE_UNDEFINED_SANITIZER=ON \ -DENABLE_ADDRESS_SANITIZER=ON \ - -DCMAKE_C_COMPILER=gcc-12 \ - -DCMAKE_CXX_COMPILER=g++-12 + -DCMAKE_C_COMPILER=$(host-cc) \ + -DCMAKE_CXX_COMPILER=$(host-cxx) displayName: 'Create Build Environment' workingDirectory: $(Build.SourcesDirectory)/Meta/Lagom env: @@ -114,6 +128,7 @@ jobs: - script: | cmake --build . + cmake --install . --prefix $(Build.SourcesDirectory)/Meta/Lagom/Install displayName: 'Build' workingDirectory: $(Build.SourcesDirectory)/Meta/Lagom/Build env: diff --git a/Meta/Azure/Setup.yml b/Meta/Azure/Setup.yml index c24b7eb5ca..66a274147c 100644 --- a/Meta/Azure/Setup.yml +++ b/Meta/Azure/Setup.yml @@ -19,7 +19,7 @@ steps: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main' sudo apt-get update - sudo apt-get install ccache gcc-12 g++-12 clang-13 libstdc++-12-dev ninja-build unzip + sudo apt-get install ccache gcc-12 g++-12 clang-13 libstdc++-12-dev ninja-build unzip qt6-base-dev qt6-tools-dev-tools libgl1-mesa-dev sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100 @@ -34,7 +34,7 @@ steps: - ${{ if eq(parameters.os, 'macOS') }}: # macOS ships an ancient Bash 3.x by default - script: | - brew install bash ninja wabt ccache unzip + brew install bash ninja wabt ccache unzip qt llvm@15 displayName: 'Install Dependencies' - ${{ if eq(parameters.os, 'Android') }}: |