mirror of
https://github.com/RGBCube/serenity
synced 2025-06-25 07:12:07 +00:00
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.
This commit is contained in:
parent
325eabc770
commit
9bdb44c5d2
2 changed files with 9 additions and 9 deletions
4
.github/workflows/cmake.yml
vendored
4
.github/workflows/cmake.yml
vendored
|
@ -71,8 +71,8 @@ jobs:
|
||||||
# *and* as actual output variable, in this order.
|
# *and* as actual output variable, in this order.
|
||||||
message(" set-output name=time::${current_date}")
|
message(" set-output name=time::${current_date}")
|
||||||
message("::set-output name=time::${current_date}")
|
message("::set-output name=time::${current_date}")
|
||||||
message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/BuildIt.sh') }}")
|
message(" set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*[!llvm].patch', 'Toolchain/BuildIt.sh') }}")
|
||||||
message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*.patch', 'Toolchain/BuildIt.sh') }}")
|
message("::set-output name=libc_headers::${{ hashFiles('Userland/Libraries/LibC/**/*.h', 'Userland/Libraries/LibPthread/**/*.h', 'Toolchain/Patches/*[!llvm].patch', 'Toolchain/BuildIt.sh') }}")
|
||||||
|
|
||||||
- name: Toolchain cache
|
- name: Toolchain cache
|
||||||
# TODO: Change the version to the released version when https://github.com/actions/cache/pull/489 (or 571) is merged.
|
# TODO: Change the version to the released version when https://github.com/actions/cache/pull/489 (or 571) is merged.
|
||||||
|
|
|
@ -7,16 +7,16 @@ parameters:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- ${{ if ne(parameters.arch, 'Lagom') }}:
|
- ${{ if ne(parameters.arch, 'Lagom') }}:
|
||||||
- ${{ if eq(parameters.toolchain, 'gcc') }}:
|
|
||||||
- task: Cache@2
|
|
||||||
inputs:
|
|
||||||
key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildClang.sh | 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, 'clang') }}:
|
||||||
- task: Cache@2
|
- task: Cache@2
|
||||||
inputs:
|
inputs:
|
||||||
key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.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, 'gcc') }}:
|
||||||
|
- task: Cache@2
|
||||||
|
inputs:
|
||||||
|
key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/*[!llvm].patch | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h'
|
||||||
path: $(Build.SourcesDirectory)/Toolchain/Cache
|
path: $(Build.SourcesDirectory)/Toolchain/Cache
|
||||||
displayName: 'Toolchain Cache'
|
displayName: 'Toolchain Cache'
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue