From e4e2263c7b97e47506919e29442efb395eaba99d Mon Sep 17 00:00:00 2001
From: hackerman <3372410+aeneasr@users.noreply.github.com>
Date: Tue, 22 Jun 2021 17:34:02 +0200
Subject: [PATCH] test: resolve windows build failures (#754)

---
 .circleci/config.yml               |  4 ++--
 .github/workflows/windows_test.yml | 16 ----------------
 rule/fetcher_default_test.go       |  4 ++++
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 .github/workflows/windows_test.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 29c5149a4c..9d81d7b6a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,8 +29,8 @@ jobs:
       - goreleaser/check
       - golangci/install
       - golangci/lint
-      - run: go install github.com/ory/go-acc github.com/mattn/goveralls
-      - run: go-acc -o coverage.out ./... -- -failfast -timeout=20m
+      - run: make .bin/go-acc
+      - run: .bin/go-acc -o coverage.out ./... -- -failfast -timeout=20m
       - run: |
           bash <(curl -s https://codecov.io/bash)
       - run: ./test/e2e/run.sh
diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml
deleted file mode 100644
index ca94f7d745..0000000000
--- a/.github/workflows/windows_test.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Windows go test
-
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - '*'
-
-jobs:
-  test:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: go test -failfast -timeout=20m ./...
diff --git a/rule/fetcher_default_test.go b/rule/fetcher_default_test.go
index b2181e1c63..cdcaa1cccf 100644
--- a/rule/fetcher_default_test.go
+++ b/rule/fetcher_default_test.go
@@ -229,6 +229,10 @@ access_rules:
 }
 
 func TestFetcherWatchRepositoryFromFS(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("Skipping watcher tests on windows")
+	}
+
 	conf := internal.NewConfigurationWithDefaults() // this resets viper!!
 	r := internal.NewRegistry(conf)