fix that CI go:embed test forever, again (#405)

getkin · Aug 13, 2021 · ebccd50 · ebccd50
1 parent f16058d
commit ebccd50
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 53 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -68,15 +68,13 @@ jobs:
     - run: go test -v -run TestRaceyPatternSchema -race ./...
       env:
         CGO_ENABLED: '1'
+      run: git --no-pager diff && [[ $(git --no-pager diff --name-only | wc -l) = 0 ]]
     - run: |
-        cd openapi3/testdata
-        go get -u -v github.com/getkin/kin-openapi
-        go test -tags with_embed ./...
-        git --no-pager diff && git checkout -- .
-        cd -
+        cp openapi3/testdata/load_with_go_embed_test.go openapi3/
+        cat go.mod | sed 's%go 1.14%go 1.16%' >gomod && mv gomod go.mod
+        go test ./...
       if: matrix.go != '1.14'
     - if: runner.os == 'Linux'
-      run: git --no-pager diff && [[ $(git --no-pager diff --name-only | wc -l) = 0 ]]
 
 
     - if: runner.os == 'Linux'

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@
 
  # IntelliJ / GoLand
 .idea
+
+/openapi3/load_with_go_embed_test.go
diff --git a/openapi3/testdata/go.mod b/openapi3/testdata/go.mod
diff --git a/openapi3/testdata/go.sum b/openapi3/testdata/go.sum
diff --git a/openapi3/testdata/load_with_go_embed_test.go b/openapi3/testdata/load_with_go_embed_test.go
@@ -1,5 +1,3 @@
-//+build with_embed
-
 package openapi3_test
 
 import (
@@ -10,7 +8,7 @@ import (
 	"github.com/getkin/kin-openapi/openapi3"
 )
 
-//go:embed recursiveRef/*
+//go:embed testdata/recursiveRef/*
 var fs embed.FS
 
 func Example() {
@@ -20,7 +18,7 @@ func Example() {
 		return fs.ReadFile(uri.Path)
 	}
 
-	doc, err := loader.LoadFromFile("recursiveRef/openapi.yml")
+	doc, err := loader.LoadFromFile("testdata/recursiveRef/openapi.yml")
 	if err != nil {
 		panic(err)
 	}