Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-js
Manage
Activity
Members
Labels
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-js
Commits
fc6ae393
Commit
fc6ae393
authored
2 years ago
by
ko_oler
Browse files
Options
Downloads
Patches
Plain Diff
fix .gitlab-ci.yml
parent
c7e849c6
No related branches found
No related tags found
1 merge request
!1
Добавлена генерация файлов для frontend в Makefile и публикацию npm-пакета
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+2
-2
2 additions, 2 deletions
Makefile
config/tsconfig.json
+2
-1
2 additions, 1 deletion
config/tsconfig.json
with
4 additions
and
3 deletions
Makefile
+
2
−
2
View file @
fc6ae393
...
@@ -7,7 +7,6 @@ DSTDIR=config/clients
...
@@ -7,7 +7,6 @@ DSTDIR=config/clients
ALLPROTO
?=
$(
shell find
$(
PROTODIR
)
-name
'*.proto'
)
ALLPROTO
?=
$(
shell find
$(
PROTODIR
)
-name
'*.proto'
)
PROTOFILES
=
$(
filter-out proto/status/status.proto,
$(
ALLPROTO
))
PROTOFILES
=
$(
filter-out proto/status/status.proto,
$(
ALLPROTO
))
PROTOTSFILES
=
$(
ALLPROTO:.proto
=
.ts
)
PROTOTSFILES
=
$(
ALLPROTO:.proto
=
.ts
)
PROTOJSFILES
=
$(
PROTOFILES:.proto
=
_pb.js
)
PROTOC_MAJOR_VERSION
=
$(
shell protoc
--version
|
awk
'{print $$2;
}
'
|
cut
-d
.
-f1
)
PROTOC_MAJOR_VERSION
=
$(
shell protoc
--version
|
awk
'{print $$2;
}
'
|
cut
-d
.
-f1
)
PROTOC_MINOR_VERSION
=
$(
shell protoc
--version
|
awk
'{print $$2;
}
'
|
cut
-d
.
-f2
)
PROTOC_MINOR_VERSION
=
$(
shell protoc
--version
|
awk
'{print $$2;
}
'
|
cut
-d
.
-f2
)
...
@@ -22,6 +21,7 @@ proto-js: protoc-check js-check generate-js $(PROTOTSFILES)
...
@@ -22,6 +21,7 @@ proto-js: protoc-check js-check generate-js $(PROTOTSFILES)
@
echo
"Generated all protobuf JavaScrypt files"
@
echo
"Generated all protobuf JavaScrypt files"
%.ts
:
%.proto
%.ts
:
%.proto
@
echo
"Generating ts files"
@
protoc
-I
=
$(
PROTODIR
)
\
@
protoc
-I
=
$(
PROTODIR
)
\
--plugin
=
@protoc-gen-ts_proto
\
--plugin
=
@protoc-gen-ts_proto
\
--ts_proto_opt
=
env
=
browser,outputServices
=
generic-definitions,outputJsonMethods
=
false
,esModuleInterop
=
true
,useOptionals
=
messages,exportCommonSymbols
=
false
,useDate
=
false
,useExactTypes
=
false
\
--ts_proto_opt
=
env
=
browser,outputServices
=
generic-definitions,outputJsonMethods
=
false
,esModuleInterop
=
true
,useOptionals
=
messages,exportCommonSymbols
=
false
,useDate
=
false
,useExactTypes
=
false
\
...
@@ -32,7 +32,7 @@ generate-js:
...
@@ -32,7 +32,7 @@ generate-js:
@
./config/generate.sh
@
./config/generate.sh
proto-clean
:
proto-clean
:
@
rm
-f
$(
PROTOTSFILES
)
-f
$(
PROTOJSFILES
)
@
rm
-f
$(
PROTOTSFILES
)
.FORCE
:
.FORCE
:
# Проверка, что установлены необходимые инструменты для генерации proto-файлов
# Проверка, что установлены необходимые инструменты для генерации proto-файлов
...
...
This diff is collapsed.
Click to expand it.
config/tsconfig.json
+
2
−
1
View file @
fc6ae393
...
@@ -98,5 +98,6 @@
...
@@ -98,5 +98,6 @@
//
"skipDefaultLibCheck"
:
true
,
/*
Skip
type
checking
.d.ts
files
that
are
included
with
TypeScript.
*/
//
"skipDefaultLibCheck"
:
true
,
/*
Skip
type
checking
.d.ts
files
that
are
included
with
TypeScript.
*/
"skipLibCheck"
:
true
/*
Skip
type
checking
all
.d.ts
files.
*/
"skipLibCheck"
:
true
/*
Skip
type
checking
all
.d.ts
files.
*/
},
},
"include"
:
[
"./clients"
],
"include"
:
[
"../clients/**/*"
],
"exclude"
:
[
"../config/**/*"
]
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment