From 3ce77840910e9d06a006c53a2302f6fd7ce30ec6 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Thu, 15 Dec 2022 18:53:21 +0800
Subject: [PATCH] fix .gitlab-ci.yml
---
.gitlab-ci.yml | 15 ++-------------
.gitmodules | 2 +-
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7cc9cb..11cb3cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,24 +4,13 @@ stages:
publish_npm:
image: "node:current-alpine"
stage: publish-npm
-
+ variables:
+ GIT_SUBMODULE_STRATEGY: recursive
before_script:
- apk add --update bash
- apk add --update make
- apk add --update protobuf-dev
- apk add --update yarn
- - apk add --update git
- - git config --global credential.helper store
- - git config --global credential.useHttpPath true
- - |
- git credential approve <<EOF
- protocol=https
- host=gitlab.com
- path=my-group/my-submodule-repo.git
- username=${CI_DEPENDENCY_PROXY_USER}
- password=${CI_DEPENDENCY_PROXY_PASSWORD}
- EOF
- - git submodule update --init --recursive
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
diff --git a/.gitmodules b/.gitmodules
index 79c7c1e..4de0a5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "perxis-proto"]
path = perxis-proto
- url = https://git.perx.ru/perxis/perxis-proto.git
+ url = ../../perxis/perxis-proto.git
\ No newline at end of file
--
GitLab