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).
This commit is contained in:
Timothy Flynn 2022-12-28 08:47:28 -05:00 committed by Tim Flynn
parent 598fcfca26
commit 0a7d0362ea
Notes: sideshowbarker 2024-07-17 02:29:46 +09:00
3 changed files with 2 additions and 42 deletions

View File

@ -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'

View File

@ -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'

View File

@ -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