diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff1f9f89c63876a807b17bff4c3f15859a808260..4af5b582e9b5ffd344372628046de91720a795a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,10 +15,5 @@ publish_npm: changes: - config/package.json script: - - npm install -g ts-proto@1.115.5 - - npm install -g typescript@4.7.4 - - make proto - - cd ./config - - NPM_PACKAGE_VERSION=$(node -p "require('./package.json').version") - - yarn pub - - echo "Successfully published version ${NPM_PACKAGE_VERSION} to GitLab's NPM registry" \ No newline at end of file + - cd ./perxis-proto/proto + - ls -a \ No newline at end of file diff --git a/Makefile b/Makefile index c8ab5cfae3068cf90d407374219d16b685f71c4d..61b6322d639a6b44fc773bc500a3f97870261747 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ .PHONY: proto-js .FORCE SHELL = /bin/bash -o pipefail -PROTODIR=./perxis-proto/proto -DSTDIR=./config/dist +PROTODIR=perxis-proto/proto +DSTDIR=config/dist ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' ) PROTOFILES= $(filter-out proto/status/status.proto, $(ALLPROTO))