From ca783e2b1272491c64a27b376d0948b7930c212f Mon Sep 17 00:00:00 2001
From: ibon eskudero <ibon.eskudero@tecnalia.com>
Date: Fri, 5 Apr 2024 08:44:25 +0200
Subject: [PATCH] revert changes
---
npm-packages/artifactory_built.yml | 18 +++++++-----------
npm-packages/build_typescript.yml | 20 ++++++++------------
2 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/npm-packages/artifactory_built.yml b/npm-packages/artifactory_built.yml
index 8294280..ab8b352 100644
--- a/npm-packages/artifactory_built.yml
+++ b/npm-packages/artifactory_built.yml
@@ -2,21 +2,17 @@ artifactory:
stage: deploy
tags:
- docker
- image: $ACR_URL/node:18.12.0
+ image: $ACR_URL/node:14
dependencies:
- - build
- variables:
- GIT_STRATEGY: none
+ - build_typescript
script:
- #set root user
- - npm -g config set user root
- # install jfrog cli
- - npm install -g jfrog-cli-go
- #create a publish package
+ - jfrog rt c import $ARTIFACTORY_CI_CONFIGURATION
+ - jfrog rt use $ACR_SERVER_ID
+ - jfrog rt ping
+ - jfrog rt npm-install --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID
+ - npm run build
- jfrog rt npm-publish --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID
- # save environment variables into thepackage
- jfrog rt bce $CI_PROJECT_NAME $CI_JOB_ID
- # publish the package to artifactory
- jfrog rt bp $CI_PROJECT_NAME $CI_JOB_ID
only:
- tags
\ No newline at end of file
diff --git a/npm-packages/build_typescript.yml b/npm-packages/build_typescript.yml
index 54e27d1..5f29189 100644
--- a/npm-packages/build_typescript.yml
+++ b/npm-packages/build_typescript.yml
@@ -1,8 +1,11 @@
+before_script:
+ - npm -g config set user root
+ - npm install -g jfrog-cli-go
+
cache:
paths:
- node_modules/
- - dist/
- - root/.jfrog/
+
build:
stage: build
artifacts:
@@ -10,19 +13,12 @@ build:
expire_in: 1 day
tags:
- docker
- image: $ACR_URL/node:18.12.0
+ image: $ACR_URL/node:14
script:
- #set root user
- - npm -g config set user root
- # install jfrog cli
- - npm install -g jfrog-cli-go
- # load artifactory config from base64 encoded string
- - jfrog config import $ARTIFACTORY_CI_CONFIGURATION
- # set server id
+ - jfrog rt c import $ARTIFACTORY_CI_CONFIGURATION
- jfrog rt use $ACR_SERVER_ID
- # install dependencies
+ - jfrog rt ping
- jfrog rt npm-install --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID
- # build the package
- npm run build
only:
- tags
--
GitLab