Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2023.09.11.01 [skip pd_pr] #1588

Merged
merged 15 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ jobs:
uses: actions/checkout@v3
# https://pnpm.io/continuous-integration#github-actions
- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
cache: "pnpm"
cache-dependency-path: "ui/pnpm-lock.yaml"
- uses: actions/setup-go@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
uses: actions/checkout@v3
# https://pnpm.io/continuous-integration#github-actions
- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
cache: "pnpm"
cache-dependency-path: "ui/pnpm-lock.yaml"
- uses: actions/setup-go@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upload-e2e-snapshots.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
ref: ${{ github.event.inputs.ref }}
# https://pnpm.io/continuous-integration#github-actions
- name: Setup PNPM
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "16"
node-version: "18"
cache: "pnpm"
cache-dependency-path: "ui/pnpm-lock.yaml"
- uses: actions/setup-go@v3
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ The followings are required for developing TiDB Dashboard:
- git - Version control
- make - Build tool (run common workflows)
- [Golang 1.19+](https://golang.org/) - To compile the server.
- [Node.js 16](https://nodejs.org/) - To compile the front-end.
- [PNPM 7](https://pnpm.io/) - To manage front-end dependencies.
- [Node.js 18](https://nodejs.org/) - To compile the front-end.
- [PNPM 8](https://pnpm.io/) - To manage front-end dependencies.
- [Java 8+](https://www.java.com/ES/download/) - To generate JavaScript API client by OpenAPI specification.

### Step 3. Build and Run TiDB Dashboard
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/alpine316.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN pnpm fetch
# Build.
WORKDIR /go/src/github.com/pingcap/tidb-dashboard
COPY .. .
RUN make package PNPM_INSTALL_TAGS=--offline
RUN make package

FROM alpine:3.16

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/centos7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN pnpm fetch
# Build.
WORKDIR /go/src/github.com/pingcap/tidb-dashboard
COPY .. .
RUN make package PNPM_INSTALL_TAGS=--offline
RUN make package

FROM centos:8

Expand Down
17 changes: 9 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ require (
github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/swaggo/http-swagger v0.0.0-20200308142732-58ac5e232fba
github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476
github.com/swaggo/http-swagger v1.2.6
github.com/swaggo/swag v1.7.9
github.com/vmihailenco/msgpack/v5 v5.3.5
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
go.uber.org/atomic v1.9.0
Expand Down Expand Up @@ -71,10 +71,10 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fogleman/gg v1.3.0 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/spec v0.19.4 // indirect
github.com/go-openapi/swag v0.19.5 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/spec v0.20.4 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-playground/locales v0.13.0 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
Expand All @@ -84,16 +84,17 @@ require (
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/leodido/go-urn v1.2.0 // indirect
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-sqlite3 v1.14.15 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 // indirect
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.uber.org/dig v1.9.0 // indirect
Expand Down
Loading
Loading