From 726eeb924ba9e474494171fe0df8c70fd79f0bdd Mon Sep 17 00:00:00 2001
From: ibon eskudero <ibon.eskudero@tecnalia.com>
Date: Fri, 5 Apr 2024 12:26:19 +0200
Subject: [PATCH] fix
---
npm-packages/artifactory_built.yml | 6 +++---
npm-packages/artifactory_connect.yml | 2 +-
npm-packages/build_typescript.yml | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/npm-packages/artifactory_built.yml b/npm-packages/artifactory_built.yml
index d33a9e6..266bde6 100644
--- a/npm-packages/artifactory_built.yml
+++ b/npm-packages/artifactory_built.yml
@@ -1,8 +1,6 @@
#do artifactory connections
include:
- local:
- - 'npm-packages/artifactory_connect.yml'
-
+ local: 'artifactory_connect.yml'
artifactory:
stage: deploy
image: $ACR_URL/node:18.12.0
@@ -13,6 +11,8 @@ artifactory:
variables:
GIT_STRATEGY: none
script:
+ # connect job from artifactory_connect.yml
+ - !reference [connect]
#create a publish package
- jfrog rt npm-publish --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID
# save environment variables into thepackage
diff --git a/npm-packages/artifactory_connect.yml b/npm-packages/artifactory_connect.yml
index e4c7328..b884fb6 100644
--- a/npm-packages/artifactory_connect.yml
+++ b/npm-packages/artifactory_connect.yml
@@ -1,5 +1,5 @@
connect:
- before_script:
+ script:
#set root user
- npm -g config set user root
# install jfrog cli. Use cache on .npm folder
diff --git a/npm-packages/build_typescript.yml b/npm-packages/build_typescript.yml
index de2986e..6812643 100644
--- a/npm-packages/build_typescript.yml
+++ b/npm-packages/build_typescript.yml
@@ -1,8 +1,6 @@
#do artifactory connections
include:
- local:
- - 'npm-packages/artifactory_connect.yml'
-
+ local: 'artifactory_connect.yml'
build:
image: $ACR_URL/node:18.12.0
stage: build
@@ -11,7 +9,9 @@ build:
expire_in: 1 day
paths:
- dist/**/*
- script:
+ script:
+ # connect job from artifactory_connect.yml
+ - !reference [connect]
# install dependencies
- jfrog rt npm-install --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID
# build the package
--
GitLab