Skip to content
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.

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

add windows build #380

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 55 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: windows

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test:
strategy:
matrix:
go-version: [1.20.x]
os: [windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
cache: true

- name: Install tools
run: |
go install golang.org/x/tools/cmd/goimports@latest

- name: Test
run: |
$Env:VDLPATH=$Env:GITHUB_WORKSPACE
go test --race --covermode=atomic --timeout=15m ./...
cd x/ref/examples
go test --race --covermode=atomic ./...

integration-tests:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x
cache: true

- name: Install openssl
run: |
choco install openssl

- name: Test
run: |
make test-integration test-openssl-integration
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
golang.org/x/mod v0.7.0
golang.org/x/net v0.5.0
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.4.0
golang.org/x/term v0.4.0
golang.org/x/text v0.6.0
v.io/x/lib v0.1.13
Expand All @@ -28,7 +29,6 @@ require (
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/sys v0.4.0 // indirect
)

replace v.io/x/ref/lib/flags/sitedefaults => ./x/ref/lib/flags/sitedefaults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package filelock

import (
"internal/syscall/windows"
"golang.org/x/sys/windows"
"os"
"syscall"
)
Expand Down
4 changes: 2 additions & 2 deletions x/ref/runtime/factories/roaming/roaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build linux || darwin
// +build linux darwin
//go:build linux || darwin || windows
// +build linux darwin windows

// Package roaming implements a RuntimeFactory suitable for a variety of network
// configurations, including 1-1 NATs, dhcp auto-configuration, Amazon Web
Expand Down
4 changes: 2 additions & 2 deletions x/ref/runtime/factories/static/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build linux || darwin
// +build linux darwin
//go:build linux || darwin || windows
// +build linux darwin windows

// Package static implements a RuntimeFactory suitable for a variety of network
// configurations, including 1-1 NATs, Amazon Web Services and Google Compute
Expand Down