diff options
| -rw-r--r-- | Meta/Azure/Serenity.yml | 2 | ||||
| -rw-r--r-- | Meta/Azure/Toolchain.yml | 34 | ||||
| -rw-r--r-- | azure-pipelines.yml | 8 |
3 files changed, 2 insertions, 42 deletions
diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index c727df8b9f..76a9180d53 100644 --- a/Meta/Azure/Serenity.yml +++ b/Meta/Azure/Serenity.yml @@ -33,7 +33,7 @@ jobs: serenity_ccache_path: '$(SERENITY_CCACHE_DIR)' - script: ./Toolchain/BuildClang.sh --ci - displayName: Extract Toolchain + displayName: Build Toolchain env: TRY_USE_LOCAL_TOOLCHAIN: 'y' diff --git a/Meta/Azure/Toolchain.yml b/Meta/Azure/Toolchain.yml deleted file mode 100644 index 3e76767522..0000000000 --- a/Meta/Azure/Toolchain.yml +++ /dev/null @@ -1,34 +0,0 @@ -jobs: - - job: 'Serenity_Clang_Toolchain' - timeoutInMinutes: 0 # Setting to 0 means the maximum allowed timeout is used. - - variables: - - name: LLVM_CCACHE_DIR - value: $(Build.SourcesDirectory)/Toolchain/.ccache - - name: LLVM_CCACHE_MAXSIZE - value: 20GB - - pool: - vmImage: ubuntu-22.04 - - steps: - - template: Setup.yml - parameters: - os: 'Serenity' - - - template: Caches.yml - parameters: - toolchain: 'clang' - toolchain_ccache_path: '$(LLVM_CCACHE_DIR)' - toolchain_ccache_size: '$(LLVM_CCACHE_MAXSIZE)' - with_remote_data_caches: false - - - script: ./Toolchain/BuildClang.sh --ci - displayName: Build Toolchain - env: - TRY_USE_LOCAL_TOOLCHAIN: 'y' - - - script: | - echo "##[section]Toolchain Cache" - CCACHE_DIR='$(LLVM_CCACHE_DIR)' ccache -s - displayName: 'Cache Stats' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1ac61cffb1..348c9971d5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,14 +23,8 @@ stages: parameters: os: 'macOS' - - stage: Toolchain - dependsOn: [] - - jobs: - - template: Meta/Azure/Toolchain.yml - - stage: SerenityOS - dependsOn: Toolchain + dependsOn: [] jobs: - template: Meta/Azure/Serenity.yml |