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
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-js
Commits
40cd417c
Commit
40cd417c
authored
2 years ago
by
Pavel Antonov
Browse files
Options
Downloads
Plain Diff
Merge branch 'chore/PRXS-1491-UpdateDependencies' into 'master'
Обновлены зависимости See merge request
!8
parents
c159ca71
bf3f5e44
No related branches found
No related tags found
1 merge request
!8
Обновлены зависимости
Pipeline
#33142
passed
2 years ago
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
Makefile
+7
-7
7 additions, 7 deletions
Makefile
config/package.json
+2
-2
2 additions, 2 deletions
config/package.json
with
12 additions
and
12 deletions
.gitlab-ci.yml
+
3
−
3
View file @
40cd417c
...
@@ -10,9 +10,9 @@ publish_npm:
...
@@ -10,9 +10,9 @@ publish_npm:
-
apk --no-cache add git
-
apk --no-cache add git
-
git submodule update --remote --merge
-
git submodule update --remote --merge
-
apk add --update make bash protobuf-dev yarn
-
apk add --update make bash protobuf-dev yarn
-
npm install -g ts-proto@1.1
15.5
-
npm install -g ts-proto@1.1
51.1
-
npm install -g typescript@
4.7.4
-
npm install -g typescript@
5.1.6
-
npm i protobufjs@
6.11.3
-
npm i protobufjs@
7.2.4
rules
:
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH'
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH'
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
7
−
7
View file @
40cd417c
...
@@ -55,20 +55,20 @@ ifeq (,$(shell which npm))
...
@@ -55,20 +55,20 @@ ifeq (,$(shell which npm))
endif
endif
ifeq
(,$(shell which protoc-gen-ts_proto))
ifeq
(,$(shell which protoc-gen-ts_proto))
$(
error
"Ts-proto plugin for protoc not found.
\
$(
error
"Ts-proto plugin for protoc not found.
\
Run
\"
npm install -g ts-proto@1.1
15.5
\"
\
Run
\"
npm install -g ts-proto@1.1
51.1
\"
\
or visit
\"
https://github.com/stephenh/ts-proto
\"
for more.
\n
"
)
or visit
\"
https://github.com/stephenh/ts-proto
\"
for more.
\n
"
)
endif
endif
ifeq
(,$(shell which tsc))
ifeq
(,$(shell which tsc))
$(
error
"Typescript not found.
\
$(
error
"Typescript not found.
\
Run
\"
npm install -g typescript@
4.7.4
\"
\
Run
\"
npm install -g typescript@
5.1.6
\"
\
or visit
\"
https://github.com/microsoft/TypeScript
\"
for more.
\n
"
)
or visit
\"
https://github.com/microsoft/TypeScript
\"
for more.
\n
"
)
endif
endif
ifneq
($(shell expr $(TSC_MAJOR_VERSION) \>=
4
), 1)
ifneq
($(shell expr $(TSC_MAJOR_VERSION) \>=
5
), 1)
$(
error
"Current version is outdated. Please update typescript
\n
"
)
$(
error
"Current version is outdated. Please update typescript
\n
"
)
endif
endif
ifneq
($(shell expr $(TSC_MINOR_VERSION) \>=
7
), 1)
ifneq
($(shell expr $(TSC_MINOR_VERSION) \>=
1
), 1)
$(
error
"Current version is lower than
4.7
Please update typescript
\n
"
)
$(
error
"Current version is lower than
5.1
Please update typescript
\n
"
)
endif
endif
ifneq
($(shell expr $(TSC_MIC_VERSION) \>=
4
), 1)
ifneq
($(shell expr $(TSC_MIC_VERSION) \>=
6
), 1)
$(
error
"Current version is lower than
4.7.4
Please update typescript
\n
"
)
$(
error
"Current version is lower than
5.1.6
Please update typescript
\n
"
)
endif
endif
This diff is collapsed.
Click to expand it.
config/package.json
+
2
−
2
View file @
40cd417c
{
{
"name"
:
"@perxis-js/perxis-client"
,
"name"
:
"@perxis-js/perxis-client"
,
"version"
:
"1.1.
4
"
,
"version"
:
"1.1.
5
"
,
"description"
:
""
,
"description"
:
""
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"files"
:
[
"files"
:
[
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
"pub"
:
"npm publish"
"pub"
:
"npm publish"
},
},
"dependencies"
:
{
"dependencies"
:
{
"protobufjs"
:
"
^6.11.3
"
"protobufjs"
:
"
7.2.4
"
},
},
"author"
:
""
,
"author"
:
""
,
"license"
:
"ISC"
"license"
:
"ISC"
...
...
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