diff options
| author | Timothy Flynn <trflynn89@pm.me> | 2022-12-28 08:47:28 -0500 |
|---|---|---|
| committer | Tim Flynn <trflynn89@pm.me> | 2022-12-28 15:26:12 -0500 |
| commit | 0a7d0362eaf08cec03e648c08d4d5fca84668ae5 (patch) | |
| tree | 5f3e1a28909d5381a1afb6feb971a456620a887e /Meta/Azure | |
| parent | 598fcfca2614204cec1e42d6773df872ee271185 (diff) | |
| download | serenity-0a7d0362eaf08cec03e648c08d4d5fca84668ae5.zip | |
CI: Remove extraneous toolchain job from Azure CI
This was useful when building both i686 and x86_64 SerenityOS targets as
we could use a single toolchain build for both targets. But now all this
extra job does is create the opportunity for the toolchain to need to be
built twice (i.e. if the pipelines are backed up and the toolchain cache
is busted between these jobs while the x86_64 step is waiting for a VM).
Diffstat (limited to 'Meta/Azure')
| -rw-r--r-- | Meta/Azure/Serenity.yml | 2 | ||||
| -rw-r--r-- | Meta/Azure/Toolchain.yml | 34 |
2 files changed, 1 insertions, 35 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' |