diff options
Diffstat (limited to 'Meta/Azure/Serenity.yml')
| -rw-r--r-- | Meta/Azure/Serenity.yml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index 42a406fe0f..04f3af3281 100644 --- a/Meta/Azure/Serenity.yml +++ b/Meta/Azure/Serenity.yml @@ -21,7 +21,7 @@ jobs: parameters: arch: '${{ parameters.arch }}' toolchain: 'clang' - build_directory: 'Build' + build_directory: 'Build/${{ parameters.arch }}clang' - script: ./Toolchain/BuildClang.sh displayName: Build Toolchain @@ -30,31 +30,30 @@ jobs: ARCH: '${{ parameters.arch }}' - script: | - mkdir -p Build + mkdir -p Build/superbuild displayName: 'Create Build Directory' - script: | - cmake -GNinja \ + cmake -S Meta/CMake/Superbuild -B Build/superbuild -GNinja \ -DSERENITY_ARCH=${{ parameters.arch }} \ - -DUSE_CLANG_TOOLCHAIN=ON \ + -DSERENITY_TOOLCHAIN=Clang \ -DENABLE_UNDEFINED_SANITIZER=ON \ -DENABLE_PCI_IDS_DOWNLOAD=OFF \ -DENABLE_USB_IDS_DOWNLOAD=OFF \ -DCMAKE_C_COMPILER=gcc-10 \ - -DCMAKE_CXX_COMPILER=g++-10 \ - .. + -DCMAKE_CXX_COMPILER=g++-10 displayName: 'Create Build Environment' - workingDirectory: $(Build.SourcesDirectory)/Build + workingDirectory: $(Build.SourcesDirectory) - script: | - cmake --build . + cmake --build ./Build/superbuild displayName: 'Build' - workingDirectory: $(Build.SourcesDirectory)/Build + workingDirectory: $(Build.SourcesDirectory) - script: | ninja install && ninja image displayName: 'Create RootFS' - workingDirectory: $(Build.SourcesDirectory)/Build + workingDirectory: $(Build.SourcesDirectory)/Build/${{ parameters.arch }}clang - script: | ninja run @@ -73,7 +72,7 @@ jobs: exit 1 fi displayName: 'Test' - workingDirectory: $(Build.SourcesDirectory)/Build + workingDirectory: $(Build.SourcesDirectory)/Build/${{ parameters.arch }}clang timeoutInMinutes: 60 env: SERENITY_QEMU_CPU: 'max,vmx=off' @@ -83,7 +82,7 @@ jobs: - script: | [ ! -e debug.log ] || cat debug.log displayName: 'Print Target Logs' - workingDirectory: $(Build.SourcesDirectory)/Build + workingDirectory: $(Build.SourcesDirectory)/Build/${{ parameters.arch }}clang condition: failed() - script: | |