Skip to content

Commit 54f7625

Browse files
authored
build: run windows in matrix with other jobs (#1770)
We have made enough improvements to the windows test performance such that this is possible now. Signed-off-by: Charlie Egan <charlie_egan@apple.com>
1 parent ccab7bd commit 54f7625

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
- runner: macos-14
3131
name: macos-arm64
3232
static: true
33+
- runner: windows-latest
34+
name: windows
35+
static: true
3336
runs-on: ${{ matrix.os.runner }}
3437
steps:
3538
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -122,19 +125,3 @@ jobs:
122125
files: ./coverage.json
123126
name: regal
124127
token: ${{ secrets.CODECOV_TOKEN }} # required
125-
build-windows:
126-
runs-on: windows-latest
127-
steps:
128-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
129-
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
130-
with:
131-
go-version-file: go.mod
132-
- uses: open-policy-agent/setup-opa@950f159a49aa91f9323f36f1de81c7f6b5de9576 # v2.3.0
133-
with:
134-
version: latest
135-
static: ${{ matrix.os.static }}
136-
# TODO: windows tests are failing, but we should still run the build & tests for inspection
137-
- run: go build
138-
- run: go test ./...
139-
- run: go test -tags e2e ./e2e
140-
continue-on-error: true

e2e/cli_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ func TestLintV0WithRegoV1ImportViolations(t *testing.T) {
145145
regal("lint",
146146
"--format", "json",
147147
"--config-file", cwd("testdata/configs/v0-with-import-rego-v1.yaml"), cwd("testdata/v0/")).
148+
skip(onCondition(runtime.GOOS == "windows", "skipping on Windows")).
148149
expectExitCode(3).
149150
expectStdout(unmarshalsTo(&rep)).
150151
verify(t)

0 commit comments

Comments
 (0)