From b54a3b84e4bdf0d0db646b9fd4bbd5c059191b99 Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Thu, 15 Dec 2022 16:39:31 +0800 Subject: [PATCH] fix .gitlab-ci.yml --- config/generate.sh | 30 +++++++++++++++--------------- config/tsconfig.json | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/generate.sh b/config/generate.sh index ddbb86c..4a18331 100755 --- a/config/generate.sh +++ b/config/generate.sh @@ -54,30 +54,30 @@ generate_index() { } echo "---deleting existing *.d.ts, *.d.ts.map, *.js, *.js.map files" -find ./clients/*/**/ -path '*.d.ts' -delete -find ./clients/*/**/ -path '*.d.ts.map' -delete -find ./clients/*/**/ -path '*.js' -delete -find ./clients/*/**/ -path '*.js.map' -delete -find ./clients/*/**/ -path '*.ts.bak' -delete -find ./clients -path '*.d.ts' -delete -find ./clients -path '*.d.ts.map' -delete -find ./clients -path '*.js' -delete -find ./clients -path '*.js.map' -delete -find ./clients -path '*.ts.bak' -delete +find builds/perxis/perxis-js/clients/*/**/ -path '*.d.ts' -delete +find builds/perxis/perxis-js/clients/*/**/ -path '*.d.ts.map' -delete +find builds/perxis/perxis-js/clients/*/**/ -path '*.js' -delete +find builds/perxis/perxis-js/clients/*/**/ -path '*.js.map' -delete +find builds/perxis/perxis-js/clients/*/**/ -path '*.ts.bak' -delete +find builds/perxis/perxis-js/clients -path '*.d.ts' -delete +find builds/perxis/perxis-js/clients -path '*.d.ts.map' -delete +find builds/perxis/perxis-js/clients -path '*.js' -delete +find builds/perxis/perxis-js/clients -path '*.js.map' -delete +find builds/perxis/perxis-js/clients -path '*.ts.bak' -delete echo "---generating index.ts files" -ts_files=$(find ./clients/**/ -name '*.ts') +ts_files=$(find builds/perxis/perxis-js/clients/**/ -name '*.ts') ts_files_array=($ts_files) generate_index "${ts_files_array[@]}" echo "---generating *.d.ts, *.d.ts.map, *.js, *.js.map files" npm i protobufjs@6.11.3 -tsc --project ./config --declaration --declarationMap --sourceMap --rootDir ./clients +tsc --project builds/perxis/perxis-js/config --declaration --declarationMap --sourceMap --rootDir builds/perxis/perxis-js/clients echo "---deleting created tmp files" npm uninstall protobufjs@6.11.3 -find ./clients -name 'index.ts' -delete -find ./clients/*/** -name 'index.ts' -delete -find ./ -maxdepth 1 -name '*.json' -delete +find builds/perxis/perxis-js/clients -name 'index.ts' -delete +find builds/perxis/perxis-js/clients/*/** -name 'index.ts' -delete +find builds/perxis/perxis-js/ -maxdepth 1 -name '*.json' -delete echo "---process finished" \ No newline at end of file diff --git a/config/tsconfig.json b/config/tsconfig.json index 682cc98..2aef317 100644 --- a/config/tsconfig.json +++ b/config/tsconfig.json @@ -98,6 +98,6 @@ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, - "include": ["../clients/**/*"], - "exclude": ["../config/**/*"] + "include": ["builds/perxis/perxis-js/clients/**/*"], + "exclude": ["builds/perxis/perxis-js/config/**/*"] } -- GitLab