Merge 1c3657f into 4d56898

swaggo · Apr 5, 2023 · c8242ba · c8242ba
2 parents 4d56898 + 1c3657f
commit c8242ba
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 135 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,36 +15,18 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v3
-        with:
-          path: ./src/github.com/${{ github.repository }}
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: deps
-        working-directory: ./src/github.com/${{ github.repository }}
         run:  make deps
-        env:
-          GOPATH: ${{ runner.workspace }}
       - name: static program analysis
-        working-directory: ./src/github.com/${{ github.repository }}
         run: |
-          export PATH=$PATH:$(go env GOPATH)/bin # https://github.com/actions/setup-go/issues/14
-          mkdir -p $(go env GOPATH)/src/github.com/swaggo
-          ln -s $(pwd) $(go env GOPATH)/src/github.com/swaggo/swag
           make fmt-check lint vet
-        env:
-          GOPATH: ${{ runner.workspace }}
       - name: build
         run: make build
-        working-directory: ./src/github.com/${{ github.repository }}
-        env:
-          GOPATH: ${{ runner.workspace }}
       - name: test
-        working-directory: ./src/github.com/${{ github.repository }}
         run: make test
-        env:
-          GOPATH: ${{ runner.workspace }}
       - name: coverage
-        working-directory: ./src/github.com/${{ github.repository }}
         run: bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Swag converts Go annotations to Swagger Documentation 2.0. We've created a varie
 ```sh
 go install github.com/swaggo/swag/cmd/swag@latest
 ```
-To build from source you need [Go](https://golang.org/dl/) (1.17 or newer).
+To build from source you need [Go](https://golang.org/dl/) (1.18 or newer).
 
 Or download a pre-compiled binary from the [release page](https://github.com/swaggo/swag/releases).
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -50,7 +50,7 @@ Swag将Go的注释转换为Swagger2.0文档。我们为流行的 [Go Web Framewo
 go install github.com/swaggo/swag/cmd/swag@latest
 ```
 
-从源码开始构建的话，需要有Go环境（1.17及以上版本）。
+从源码开始构建的话，需要有Go环境（1.18及以上版本）。
 
 或者从github的release页面下载预编译好的二进制文件。
 

diff --git a/generics.go b/generics.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 package swag
 
 import (

diff --git a/generics_other.go b/generics_other.go
diff --git a/generics_other_test.go b/generics_other_test.go
diff --git a/generics_test.go b/generics_test.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 package swag
 
 import (