Skip to content

Commit b9da849

Browse files
ebarichemergify[bot]
authored andcommitted
fix: Ccache is not bundled anymore
(cherry picked from commit 31eb857) # Conflicts: # .github/workflows/runtime-ci.yml
1 parent ca4fa6d commit b9da849

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.github/workflows/runtime-ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
echo "MONO_WASM_THREADS=${{ matrix.MONO_WASM_THREADS }}" >> $env:GITHUB_ENV
5252
echo "MONO_WASM_SIMD=${{ matrix.MONO_WASM_SIMD }}" >> $env:GITHUB_ENV
5353
54+
<<<<<<< HEAD
5455
# Removed in agents since 20231001
5556
# - name: Remove ccache from chocolatey
5657
# run: |
@@ -60,6 +61,8 @@ jobs:
6061
# # the runtime's build.
6162
# del C:\ProgramData\chocolatey\bin\ccache.exe
6263

64+
=======
65+
>>>>>>> 31eb857 (fix: Ccache is not bundled anymore)
6366
- name: Clone dotnet/runtime
6467
run: |
6568
git clone --recursive https://github.com/dotnet/runtime -c core.longpaths=true

0 commit comments

Comments
 (0)