Update SwaggerUI to v4.10.3 (#28)

swaggest · Apr 5, 2022 · 82dde0d · 82dde0d
1 parent ce58b06
commit 82dde0d
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 33 deletions.
diff --git a/.github/workflows/cloc.yml b/.github/workflows/cloc.yml
@@ -2,6 +2,12 @@
 name: cloc
 on:
   pull_request:
+
+# Cancel the workflow in progress in newer build is about to start.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   cloc:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -8,17 +8,26 @@ on:
       - master
       - main
   pull_request:
+
+# Cancel the workflow in progress in newer build is about to start.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18.x
       - uses: actions/checkout@v2
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2.5.2
+        uses: golangci/golangci-lint-action@v3.1.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.43.0
+          version: v1.45.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.github/workflows/gorelease.yml b/.github/workflows/gorelease.yml
@@ -2,15 +2,21 @@
 name: gorelease
 on:
   pull_request:
+
+# Cancel the workflow in progress in newer build is about to start.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
-  GO_VERSION: 1.17.x
+  GO_VERSION: 1.18.x
 jobs:
   gorelease:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go stable
         if: env.GO_VERSION != 'tip'
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Install Go tip

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-#GOLANGCI_LINT_VERSION := "v1.43.0" # Optional configuration to pinpoint golangci-lint version.
+#GOLANGCI_LINT_VERSION := "v1.45.2" # Optional configuration to pinpoint golangci-lint version.
 
 # The head of Makefile determines location of dev-go to include standard targets.
 GO ?= go
@@ -34,7 +34,7 @@ endif
 # Add your custom targets here.
 
 SWAGGER_UI_VERSION_V3 := v3.52.5
-SWAGGER_UI_VERSION_V4 := v4.5.0
+SWAGGER_UI_VERSION_V4 := v4.10.3
 
 ## Update assets for Swagger UI v3
 update-v3:

diff --git a/README.md b/README.md
@@ -16,10 +16,10 @@ UI [v3.52.4](https://github.com/swagger-api/swagger-ui/releases/tag/v3.52.4).
 ### V4
 
 Static assets for `v4` are built from Swagger
-UI [v4.5.0](https://github.com/swagger-api/swagger-ui/releases/tag/v4.5.0).
+UI [v4.10.3](https://github.com/swagger-api/swagger-ui/releases/tag/v4.10.3).
 
 [CDN-based](https://cdnjs.com/libraries/swagger-ui) `v4cdn` uses Swagger
-UI [v4.5.0](https://github.com/swagger-api/swagger-ui/releases/tag/v4.5.0).
+UI [v4.10.3](https://github.com/swagger-api/swagger-ui/releases/tag/v4.10.3).
 
 
 ## How to use

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/swaggest/swgui
 go 1.17
 
 require (
-	github.com/bool64/dev v0.2.5
+	github.com/bool64/dev v0.2.10
 	github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/vearutop/statigz v1.1.5

diff --git a/go.sum b/go.sum
@@ -1,8 +1,8 @@
 github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/bool64/dev v0.1.41/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
-github.com/bool64/dev v0.2.5 h1:H0bylghwcjDBBhEwSFTjArEO9Dr8cCaB54QSOF7esOA=
-github.com/bool64/dev v0.2.5/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
+github.com/bool64/dev v0.2.10 h1:ypAGBazcwyIy2JvIJio8V3kdqO7AgIAYvcckW54qxr4=
+github.com/bool64/dev v0.2.10/go.mod h1:/csLrm+4oDSsKJRIVS0mrywAonLnYKFG8RvGT7Jh9b8=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/v4/static.go b/v4/static.go
diff --git a/v4/static/oauth2-redirect.html.gz b/v4/static/oauth2-redirect.html.gz
diff --git a/v4/static/swagger-ui-bundle.js.gz b/v4/static/swagger-ui-bundle.js.gz
diff --git a/v4/static/swagger-ui-standalone-preset.js.gz b/v4/static/swagger-ui-standalone-preset.js.gz
diff --git a/v4/static/swagger-ui.css.gz b/v4/static/swagger-ui.css.gz
diff --git a/v4/static/swagger-ui.js.gz b/v4/static/swagger-ui.js.gz
diff --git a/v4cdn/cdn.go b/v4cdn/cdn.go
@@ -2,7 +2,7 @@ package v4cdn
 
 const (
 	// AssetsBase is a base URL for the assets.
-	AssetsBase = "https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/4.5.0/"
+	AssetsBase = "https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/4.10.3/"
 
 	// FaviconBase is a base URL for favicons.
 	FaviconBase = "https://petstore.swagger.io/"