Skip to content

Upgrade to windows latest #191

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
moroten wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Upgrade to windows latest #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
168e02b
Upgrade GitHub actions to windows-latest
moroten Apr 2, 2026
c2cfb5a
Move test-deployment-bare earlier
moroten Mar 31, 2026
09983b3
TMP: Disable Linux and linting
moroten Apr 1, 2026
7daf43f
Fix broken WinFSP installation
moroten Mar 31, 2026
2a7ab4c
Try the unix variant
moroten Apr 2, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
{
"if": "matrix.host.platform_name == 'windows_amd64'",
"name": "Install WinFSP",
"run": "choco install winfsp"
"run": "winget install --id=WinFsp.WinFsp --source=winget",
"shell": "powershell"
},
{
"if": "matrix.host.platform_name == 'windows_amd64'",
Expand Down Expand Up @@ -151,7 +152,7 @@
{
"bazel_os": "windows",
"cross_compile": false,
"os": "windows-2022",
"os": "windows-latest",
"platform_name": "windows_amd64",
"upload": false
}
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/pull-requests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
{
"if": "matrix.host.platform_name == 'windows_amd64'",
"name": "Install WinFSP",
"run": "choco install winfsp"
"run": "winget install --id=WinFsp.WinFsp --source=winget",
"shell": "powershell"
},
{
"if": "matrix.host.platform_name == 'windows_amd64'",
Expand All @@ -36,7 +37,18 @@
{
"if": "matrix.host.platform_name == 'windows_amd64'",
"name": "Override .bazelrc",
"run": "echo \"startup --output_base=D:/bazel_output\" >> .bazelrc"
"run": "echo \"startup --output_base=D:/bazel_output\" >> .bazelrc",
"continue-on-error": true,
},
{
"name": "Test bare deployment (Unix)",
"run": "tools/test-deployment-bare.sh",
"shell": "bash"
},
{
"if": "matrix.host.platform_name == 'windows_amd64'",
"name": "Test bare deployment (Windows)",
"run": "tools/run-with-console.ps1 -Command 'bash.exe -c ./tools/test-deployment-bare.sh'"
},
{
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64'",
Expand Down Expand Up @@ -109,11 +121,6 @@
"run": "tools/test-deployment-bare.sh",
"shell": "bash"
},
{
"if": "matrix.host.platform_name == 'windows_amd64'",
"name": "Test bare deployment (Windows)",
"run": "tools/run-with-console.ps1 -Command 'bash.exe -c ./tools/test-deployment-bare.sh'"
},
{
"if": "matrix.host.platform_name == 'linux_amd64'",
"name": "Test docker-compose deployment",
Expand All @@ -128,17 +135,10 @@
"strategy": {
"matrix": {
"host": [
{
"bazel_os": "linux",
"cross_compile": true,
"os": "ubuntu-latest",
"platform_name": "linux_amd64",
"upload": true
},
{
"bazel_os": "windows",
"cross_compile": false,
"os": "windows-2022",
"os": "windows-latest",
"platform_name": "windows_amd64",
"upload": false
}
Expand Down
5 changes: 1 addition & 4 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ git_override(
git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "d0c6f2633bb9e199fc7285687cdd677660dc688c",
patches = [
"//:patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch",
"//:patches/com_github_buildbarn_bb_storage/workflows-template-bazel-8.diff",
],
patches = ["//:patches/com_github_buildbarn_bb_storage/workflows-template-bazel-8.diff"],
remote = "https://github.com/buildbarn/bb-storage.git",
)

Expand Down
13 changes: 0 additions & 13 deletions patches/com_github_buildbarn_bb_storage/github-workflow-windows-2022.patch
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tools/github_workflows/github_workflows.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ workflows_template.getWorkflows(
},
{
name: 'Install WinFSP',
run: 'choco install winfsp',
shell: 'powershell',
run: 'winget install --id=WinFsp.WinFsp --source=winget',
'if': "matrix.host.platform_name == 'windows_amd64'",
},
{
Expand Down
3 changes: 1 addition & 2 deletions tools/update-container-image-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ check_module_overrides() {
commit_hash=$(get_full_git_commit_hash "$repo")
remote=https://github.com/buildbarn/"$repo".git

# As long as we use patches, -B3 is not enough.
override_stanza="$(grep -B5 -A1 "$remote" MODULE.bazel)"
override_stanza="$(grep -B3 -A1 "$remote" MODULE.bazel)"
echo "$override_stanza" | grep -q "$commit_hash" || {
echo >&2 "Error: Did not find the expected module version override for $repo."
echo "Found: $override_stanza"
Expand Down
Loading