From 35bf699fb56a01c059811f0e4f1f85195dc84dc3 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 16:07:20 +0000 Subject: [PATCH 1/9] DO NOT MERGE --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc8ac539a3a09..d14a927292035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,12 @@ jobs: # Check the `calculate_matrix` job to see how is the matrix defined. include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }} steps: + - name: Diskspace + shell: pwsh + run: | + Get-Volume + diskusage /t:100 C:\ + exit 1 - name: Install cargo in AWS CodeBuild if: matrix.codebuild run: | From b9172b6129ed473451469e8359eb642bce765d5c Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 17:02:59 +0000 Subject: [PATCH 2/9] Update ci.yml --- .github/workflows/ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d14a927292035..a97a735103766 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,17 @@ jobs: shell: pwsh run: | Get-Volume - diskusage /t:100 C:\ + #diskusage /t:500 C:\ + $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', + 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', + 'C:\rtools45', 'C:\ghcup', 'C:\Program Files\WSL', 'C:\Program Files (x86)\Android', + 'C:\Program Files\Google\Chrome', 'C:\Program Files (x86)\Microsoft\Edge', + 'C:\Program Files\Mozilla Firefox', 'C:\Program Files\MySQL', 'C:\Julia', + 'C:\Program Files\MongoDB', 'C:\Program Files\Azure Cosmos DB Emulator', + 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', + 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' + Remove-Item -Recurse -Force $dirs + Get-Volume exit 1 - name: Install cargo in AWS CodeBuild if: matrix.codebuild From 69e68d9f02f653c2f8e39739529fcb07d6792965 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 17:10:47 +0000 Subject: [PATCH 3/9] Update jobs.yml --- .github/workflows/ci.yml | 6 +++--- src/ci/github-actions/jobs.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a97a735103766..db9219ce6e35a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: - name: Diskspace shell: pwsh run: | - Get-Volume + Get-Volume > '\\.\CON' #diskusage /t:500 C:\ $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', @@ -111,8 +111,8 @@ jobs: 'C:\Program Files\MongoDB', 'C:\Program Files\Azure Cosmos DB Emulator', 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' - Remove-Item -Recurse -Force $dirs - Get-Volume + Remove-Item -Recurse -Force -ErrorAction Continue $dirs + Get-Volume > '\\.\CON' exit 1 - name: Install cargo in AWS CodeBuild if: matrix.codebuild diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index f0c52fe3d1ca0..8160ffb5bc4f9 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -31,7 +31,7 @@ runners: <<: *base-job - &job-windows - os: windows-2022 + os: windows-2025 <<: *base-job # NOTE: windows-2025 has less disk space available than windows-2022, @@ -41,7 +41,7 @@ runners: <<: *base-job - &job-windows-8c - os: windows-2022-8core-32gb + os: windows-2025-8core-32gb <<: *base-job - &job-windows-25-8c From b0b6ede3b9cee31ba92d7f6c5590ca0602716256 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 17:47:30 +0000 Subject: [PATCH 4/9] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db9219ce6e35a..6489021bbe474 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: - name: Diskspace shell: pwsh run: | - Get-Volume > '\\.\CON' + Get-Volume | Out-String | Write-Host #diskusage /t:500 C:\ $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', @@ -112,7 +112,7 @@ jobs: 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' Remove-Item -Recurse -Force -ErrorAction Continue $dirs - Get-Volume > '\\.\CON' + Get-Volume | Out-String | Write-Host exit 1 - name: Install cargo in AWS CodeBuild if: matrix.codebuild From 059575b4e7b917925434b69bc70a57f8fdc3fe45 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 18:04:09 +0000 Subject: [PATCH 5/9] Update ci.yml --- .github/workflows/ci.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6489021bbe474..4f0a3fad7c4ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,22 +98,6 @@ jobs: # Check the `calculate_matrix` job to see how is the matrix defined. include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }} steps: - - name: Diskspace - shell: pwsh - run: | - Get-Volume | Out-String | Write-Host - #diskusage /t:500 C:\ - $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', - 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', - 'C:\rtools45', 'C:\ghcup', 'C:\Program Files\WSL', 'C:\Program Files (x86)\Android', - 'C:\Program Files\Google\Chrome', 'C:\Program Files (x86)\Microsoft\Edge', - 'C:\Program Files\Mozilla Firefox', 'C:\Program Files\MySQL', 'C:\Julia', - 'C:\Program Files\MongoDB', 'C:\Program Files\Azure Cosmos DB Emulator', - 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', - 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' - Remove-Item -Recurse -Force -ErrorAction Continue $dirs - Get-Volume | Out-String | Write-Host - exit 1 - name: Install cargo in AWS CodeBuild if: matrix.codebuild run: | @@ -239,7 +223,24 @@ jobs: run: | cd src/ci/citool CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build - + + - name: Free Diskspace + shell: pwsh + if: contains(matrix.os, 'windows') + run: | + Get-Volume | Out-String | Write-Host + #diskusage /t:500 C:\ + $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', + 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', + 'C:\rtools45', 'C:\ghcup', 'C:\Program Files (x86)\Android', + 'C:\Program Files\Google\Chrome', 'C:\Program Files (x86)\Microsoft\Edge', + 'C:\Program Files\Mozilla Firefox', 'C:\Program Files\MySQL', 'C:\Julia', + 'C:\Program Files\MongoDB', 'C:\Program Files\Azure Cosmos DB Emulator', + 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', + 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' + Remove-Item -Recurse -Force -ErrorAction Continue $dirs + Get-Volume | Out-String | Write-Host + - name: run the build run: | set +e From 4e5a8b99ad869f443fbb0ba9457f55d2bcaea3c7 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 18:19:26 +0000 Subject: [PATCH 6/9] WIP --- .github/workflows/ci.yml | 10 ++++++---- src/ci/github-actions/jobs.yml | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f0a3fad7c4ee..2f5d2925c04ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,18 +226,20 @@ jobs: - name: Free Diskspace shell: pwsh - if: contains(matrix.os, 'windows') + if: ${{ runner.os }} == "Windows" run: | Get-Volume | Out-String | Write-Host - #diskusage /t:500 C:\ - $dirs = 'C:\Windows\Installer', 'C:\Program Files\LLVM\bin', + $dirs = 'C:\Program Files\LLVM\bin', 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm', 'C:\rtools45', 'C:\ghcup', 'C:\Program Files (x86)\Android', 'C:\Program Files\Google\Chrome', 'C:\Program Files (x86)\Microsoft\Edge', 'C:\Program Files\Mozilla Firefox', 'C:\Program Files\MySQL', 'C:\Julia', 'C:\Program Files\MongoDB', 'C:\Program Files\Azure Cosmos DB Emulator', 'C:\Program Files\PostgreSQL', 'C:\Program Files\Unity Hub', 'C:\ProgramData\chocolatey', - 'C:\ProgramData\Package Cache', 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' + 'C:\Strawberry', 'C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk' + # The following are system directories that are typically large but should only be deleted + # if we're desperate for space. + # 'C:\Windows\Installer', 'C:\ProgramData\Package Cache', Remove-Item -Recurse -Force -ErrorAction Continue $dirs Get-Volume | Out-String | Write-Host diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 8160ffb5bc4f9..d77eb848644a1 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -172,9 +172,9 @@ try: optional: # This job is used just to test optional jobs. # It will be replaced by tier 2 and tier 3 jobs in the future. - - name: optional-mingw-check-1 + - name: optional-pr-check-1 env: - IMAGE: mingw-check-1 + IMAGE: pr-check-1 <<: *job-linux-4c # Main CI jobs that have to be green to merge a commit into master From 7509ab6994bba119791d771aad97959a7e04207f Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 18:32:16 +0000 Subject: [PATCH 7/9] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f5d2925c04ed..da960d16aeae4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,7 +226,7 @@ jobs: - name: Free Diskspace shell: pwsh - if: ${{ runner.os }} == "Windows" + if: ${{ runner.os == "Windows" }} run: | Get-Volume | Out-String | Write-Host $dirs = 'C:\Program Files\LLVM\bin', From 93a2d6a993fe2145eb600fc3e3f2b34e8abcf4f9 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 23:50:06 +0000 Subject: [PATCH 8/9] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da960d16aeae4..6354aeec91c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -223,7 +223,7 @@ jobs: run: | cd src/ci/citool CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build - + - name: Free Diskspace shell: pwsh if: ${{ runner.os == "Windows" }} From 9dc9554048004871e90bffb9e1cbeb969ccbdde3 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Fri, 18 Jul 2025 23:51:53 +0000 Subject: [PATCH 9/9] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6354aeec91c76..cd1ea2452474b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,7 +226,7 @@ jobs: - name: Free Diskspace shell: pwsh - if: ${{ runner.os == "Windows" }} + if: runner.os == 'Windows' run: | Get-Volume | Out-String | Write-Host $dirs = 'C:\Program Files\LLVM\bin',