Skip to content

Commit 89f0ca5

Browse files
committed
Merge branch 'release/1.4.5'
2 parents bd13ef3 + 0985e4f commit 89f0ca5

File tree

201 files changed

+13670
-8827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+13670
-8827
lines changed

.github/workflows/build-binary-for-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Node
3737
uses: actions/setup-node@v3
3838
with:
39-
node-version: 18
39+
node-version: 20.18.1
4040

4141
- name: Node Build
4242
run: make install-ui-packages ui

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ vendor/
3030
/new_answer
3131

3232
dist/
33+
34+
# Lint setup generated file
35+
.husky/

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ARG CGO_EXTRA_CFLAGS
3434

3535
COPY . ${BUILD_DIR}
3636
WORKDIR ${BUILD_DIR}
37-
RUN apk --no-cache add build-base git bash nodejs npm && npm install -g pnpm@8.9.2 \
37+
RUN apk --no-cache add build-base git bash nodejs npm && npm install -g pnpm@9.7.0 \
3838
&& make clean build
3939

4040
RUN chmod 755 answer

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: build clean ui
22

3-
VERSION=1.4.2
3+
VERSION=1.4.5
44
BIN=answer
55
DIR_SRC=./cmd/answer
66
DOCKER_CMD=docker
@@ -45,7 +45,7 @@ clean:
4545

4646
install-ui-packages:
4747
@corepack enable
48-
@corepack prepare pnpm@8.9.2 --activate
48+
@corepack prepare pnpm@9.7.0 --activate
4949

5050
ui:
5151
@cd ui && pnpm pre-install && pnpm build && cd -

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ You can also check out the [plugins here](https://answer.apache.org/plugins).
4141
### Prerequisites
4242

4343
- Golang >= 1.22
44-
- Node.js >= 16.17
45-
- pnpm >= 8
44+
- Node.js >= 20
45+
- pnpm >= 9
4646
- [mockgen](https://github.com/uber-go/mock?tab=readme-ov-file#installation) >= 1.6.0
4747
- [wire](https://github.com/google/wire/) >= 0.5.0
4848

cmd/command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func init() {
7272

7373
configCmd.Flags().StringSliceVarP(&configFields, "with", "w", []string{}, "the fields that need to be set to the default value, eg: -w allow_password_login")
7474

75-
i18nCmd.Flags().StringVarP(&i18nSourcePath, "source", "s", "", "i18n source path, eg: -f ./i18n/source")
75+
i18nCmd.Flags().StringVarP(&i18nSourcePath, "source", "s", "", "i18n source path, eg: -s ./i18n/source")
7676

7777
i18nCmd.Flags().StringVarP(&i18nTargetPath, "target", "t", "", "i18n target path, eg: -t ./i18n/target")
7878

cmd/wire_gen.go

+10-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configs/config.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ swaggerui:
3333
address: ':80'
3434
service_config:
3535
upload_path: "/data/uploads"
36+
clean_up_uploads: true
37+
clean_orphan_uploads_period_hours: 48
38+
purge_deleted_files_period_days: 30
3639
ui:
3740
public_url: '/'
3841
api_url: '/'

0 commit comments

Comments
 (0)