test on go v1.19 and cleanup (#18)

sv-tools · Aug 23, 2022 · 318e19f · 318e19f
1 parent a4d9d86
commit 318e19f
Show file tree

Hide file tree

Showing 42 changed files with 478 additions and 702 deletions.
diff --git a/.github/Brewfile b/.github/Brewfile
diff --git a/.github/goreleaser-lib.yml b/.github/goreleaser-lib.yml
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -14,9 +14,6 @@ concurrency:
   group: ${{ format('{0}-{1}', github.workflow, github.head_ref) }}
   cancel-in-progress: true
 
-env:
-  GO: "1.18"
-
 jobs:
   CodeQL:
     runs-on: ubuntu-latest
@@ -36,14 +33,18 @@ jobs:
 
   UnitTests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go:
+          - 1.18
+          - 1.19
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          stable: false
-          go-version: ${{ env.GO }}
+          go-version: ${{ matrix.go }}
       - name: gofmt
         run: diff -u <(echo -n) <(gofmt -l . )
       - name: go vet
@@ -56,20 +57,3 @@ jobs:
         uses: codecov/codecov-action@v3.1.0
         with:
           file: ./coverage.out
-
-  GolangCI-Lint:
-    if: "false"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Install Go
-        uses: actions/setup-go@v3
-        with:
-          stable: false
-          go-version: ${{ env.GO }}
-      - name: Run GolangCi-Lint
-        uses: golangci/golangci-lint-action@v3.2.0
-        with:
-          version: latest
-          skip-build-cache: true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/Makefile b/Makefile
@@ -1,23 +1,14 @@
-BREWFILE=./.github/Brewfile
+all: install tidy lint fmt test
 
-ifeq ($(shell uname), Darwin)
-all: brew-install
-endif
-
-all: go-install tidy lint test
-
-brew-install:
-	@brew bundle --file $(BREWFILE)
-
-go-install:
+install:
 	@go install golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/fieldalignment@latest
 
-run-test:
+test:
 	@go test -cover -race ./...
 
-test: run-test
+fmt:
+	@go fmt ./...
 
-# @golangci-lint run --fix ./...
 lint:
 	@go vet ./...
 	@go vet -vettool=$(which fieldalignment) ./...

diff --git a/spec/bool_or_schema_test.go b/spec/bool_or_schema_test.go
@@ -84,5 +84,4 @@ func TestAdditionalPropertiesJSON(t *testing.T) {
 			})
 		})
 	}
-
 }
diff --git a/spec/callback.go b/spec/callback.go
@@ -16,18 +16,19 @@ import (
 // https://spec.openapis.org/oas/v3.1.0#callback-object
 //
 // Example:
-//   myCallback:
-//     '{$request.query.queryUrl}':
-//       post:
-//         requestBody:
-//           description: Callback payload
-//           content:
-//             'application/json':
-//               schema:
-//                 $ref: '#/components/schemas/SomePayload'
-//         responses:
-//           '200':
-//             description: callback successfully processed
+//
+//	myCallback:
+//	  '{$request.query.queryUrl}':
+//	    post:
+//	      requestBody:
+//	        description: Callback payload
+//	        content:
+//	          'application/json':
+//	            schema:
+//	              $ref: '#/components/schemas/SomePayload'
+//	      responses:
+//	        '200':
+//	          description: callback successfully processed
 type Callback struct {
 	Callback map[string]*RefOrSpec[Extendable[PathItem]]
 }
@@ -65,5 +66,3 @@ func (o *Callback) MarshalYAML() (any, error) {
 func (o *Callback) UnmarshalYAML(node *yaml.Node) error {
 	return node.Decode(&o.Callback)
 }
-
-func (o Callback) OpenAPIConstraint() {}