diff --git a/.gitignore b/.gitignore index be01177..c07ba1a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ data/config-base.json data/config-default.ini data/*.html data/*.txt +data/docs/ dist/* jfa-go build/ diff --git a/.goreleaser.yml b/.goreleaser.yml index b5a5913..631dbce 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -8,7 +8,6 @@ release: name_template: "v{{.Version}}" before: hooks: - # You may remove this if you don't use go modules. - go mod download - python3 config/fixconfig.py -i config/config-base.json -o data/config-base.json - python3 config/generate_ini.py -i config/config-base.json -o data/config-default.ini --version {{.Version}} @@ -17,6 +16,8 @@ before: - python3 scss/compile.py -y - python3 mail/generate.py -y - python3 version.py {{.Version}} version.go + - ./tsc-silent.sh + - swag init -g main.go builds: - dir: ./ env: diff --git a/Makefile b/Makefile index b571468..d85ea25 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,6 @@ compress: copy: $(info Copying data) cp -r data build/ - cp docs/swagger.json build/data/static/ install: cp -r build $(DESTDIR)/jfa-go diff --git a/tsc-silent.sh b/tsc-silent.sh new file mode 100755 index 0000000..af3610e --- /dev/null +++ b/tsc-silent.sh @@ -0,0 +1,4 @@ +#!/usr/bin/bash +set +e +npx tsc -p ts/ +set -e