From 9bdb44c5d26d8f702264c47a82c75fbb368a7ffc Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 17 Aug 2021 17:49:40 -0600 Subject: CI: Ensure relevant patch files are part of Toolchain cache hash We were over-hashing for the GNU build on GitHub Actions by including the LLVM patch as well. The GNU Toolchain doesn't care about our LLVM patches. For Azure, fix the inversion of the condition for which jobs check which Build*.sh script, and add the Toolchain patch files to the cache hash calculation. --- Meta/Azure/Caches.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Meta/Azure') diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index d96aa4361a..5ecfe58d68 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -7,16 +7,16 @@ parameters: steps: - ${{ if ne(parameters.arch, 'Lagom') }}: - - ${{ if eq(parameters.toolchain, 'gcc') }}: + - ${{ if eq(parameters.toolchain, 'clang') }}: - task: Cache@2 inputs: - key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildClang.sh | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' + key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildClang.sh | Toolchain/Patches/*[!gcc].patch | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Cache' - - ${{ if eq(parameters.toolchain, 'clang') }}: + - ${{ if eq(parameters.toolchain, 'gcc') }}: - task: Cache@2 inputs: - key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' + key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/*[!llvm].patch | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Cache' -- cgit v1.2.3