Skip to content

chore: Fix noisy errors in Windows CI build logs #6840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danskmt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Fix noisy errors in Windows CI build logs #6840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ commands:
New-Item -Path $bashEnvScript -ItemType File -Force | Out-Null
}
$bashPath = $goBin.Replace('\', '/').Replace('C:', '/c')
'export PATH="' + $bashPath + ':$PATH"' | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
$bashLine = 'export PATH="' + $bashPath + ':$PATH"'
[System.IO.File]::AppendAllText($bashEnvScript, $bashLine + "`n", (New-Object System.Text.UTF8Encoding $false))

install-deps-windows-native-build:
steps:
Expand All @@ -276,7 +277,7 @@ commands:
- restore_cache:
name: Restoring Windows tools cache
keys:
- windows-tools-cache-v4-{{ arch }}-{{ checksum ".nvmrc" }}
- windows-tools-cache-v5-{{ arch }}-{{ checksum ".nvmrc" }}
- run:
name: Install Node.js (native)
shell: powershell
Expand Down Expand Up @@ -315,7 +316,7 @@ commands:
.\scripts\windows\ensure-python-uv.ps1
- save_cache:
name: Saving Windows tools cache
key: windows-tools-cache-v4-{{ arch }}-{{ checksum ".nvmrc" }}
key: windows-tools-cache-v5-{{ arch }}-{{ checksum ".nvmrc" }}
paths:
- << pipeline.parameters.windows_cache_dir >>
- C:\ProgramData\nvm
Expand Down
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ SHASUM_CMD = shasum
GOHOSTOS = $(shell go env GOHOSTOS)
export PYTHON = python

PYTHON_VERSION = $(shell python3 --version)
ifneq (, $(PYTHON_VERSION))
PYTHON = python3
ifneq ($(GOHOSTOS), windows)
PYTHON_VERSION = $(shell python3 --version 2>/dev/null)
ifneq (, $(PYTHON_VERSION))
PYTHON = python3
endif
endif

ifeq ($(GOHOSTOS), windows)
Expand Down
2 changes: 1 addition & 1 deletion cliv2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CACHE_DIR = $(WORKING_DIR)/_cache
LS_PROTOCOL_VERSION_FILE = $(CACHE_DIR)/ls-protocol-version
LS_COMMIT_HASH_FILE = $(CACHE_DIR)/ls-commit-hash
LS_COMMIT_HASH = $(if $(wildcard $(LS_COMMIT_HASH_FILE)),$(shell cat $(LS_COMMIT_HASH_FILE)),determined during LS metadata generation)
SRCS = $(shell find $(WORKING_DIR) -type f -name '*.go')
SRCS = $(shell $(GOCMD) list -f '{{range .GoFiles}}{{$$.Dir}}/{{.}} {{end}}' ./...)

# load cached variables if available
-include $(CACHE_DIR)/variables.mk
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows/install-dotnet-sdk.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ try {
$bashUpdateLine = 'export PATH="' + $bashPath + ':$PATH"'
$bashExisting = Get-Content -Path $bashEnvScript -ErrorAction SilentlyContinue
if (-not $bashExisting -or -not ($bashExisting -contains $bashUpdateLine)) {
$bashUpdateLine | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashUpdateLine + "`n", (New-Object System.Text.UTF8Encoding $false))
}
}
catch {
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows/install-gradle.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ try {
$bashUpdateLine = 'export PATH="' + $bashPath + ':$PATH"'
$bashExisting = Get-Content -Path $bashEnvScript -ErrorAction SilentlyContinue
if (-not $bashExisting -or -not ($bashExisting -contains $bashUpdateLine)) {
$bashUpdateLine | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashUpdateLine + "`n", (New-Object System.Text.UTF8Encoding $false))
}
}
catch {
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows/install-make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ try {
$bashUpdateLine = 'export PATH="' + $bashPath + ':$PATH"'
$bashExisting = Get-Content -Path $bashEnvScript -ErrorAction SilentlyContinue
if (-not $bashExisting -or -not ($bashExisting -contains $bashUpdateLine)) {
$bashUpdateLine | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashUpdateLine + "`n", (New-Object System.Text.UTF8Encoding $false))
}
}
catch {
Expand Down
2 changes: 1 addition & 1 deletion scripts/windows/install-maven.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ try {
$bashUpdateLine = 'export PATH="' + $bashPath + ':$PATH"'
$bashExisting = Get-Content -Path $bashEnvScript -ErrorAction SilentlyContinue
if (-not $bashExisting -or -not ($bashExisting -contains $bashUpdateLine)) {
$bashUpdateLine | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashUpdateLine + "`n", (New-Object System.Text.UTF8Encoding $false))
}
}
catch {
Expand Down
4 changes: 2 additions & 2 deletions scripts/windows/install-python3.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ try {
$bashDir = $selectedDir.Replace('\', '/').Replace('C:', '/c')
$bashLineBase = 'export PATH="' + $bashDir + ':$PATH"'
if (-not $bashExisting -or -not ($bashExisting -contains $bashLineBase)) {
$bashLineBase | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashLineBase + "`n", (New-Object System.Text.UTF8Encoding $false))
}

if (Test-Path $scriptsDir) {
$bashScriptsDir = $scriptsDir.Replace('\', '/').Replace('C:', '/c')
$bashLineScripts = 'export PATH="' + $bashScriptsDir + ':$PATH"'
if (-not $bashExisting -or -not ($bashExisting -contains $bashLineScripts)) {
$bashLineScripts | Out-File -FilePath $bashEnvScript -Append -Encoding UTF8
[System.IO.File]::AppendAllText($bashEnvScript, $bashLineScripts + "`n", (New-Object System.Text.UTF8Encoding $false))
}
}
}
Expand Down
Loading