From f7b1108ae1653231e965f6d013bb34bedb1247ba Mon Sep 17 00:00:00 2001 From: ibon eskudero <ibon.eskudero@tecnalia.com> Date: Fri, 5 Apr 2024 12:06:08 +0200 Subject: [PATCH] use connection yaml --- npm-packages/artifactory_built.yml | 15 +++++++------ npm-packages/build_typescript.yml | 36 ++++++++++-------------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/npm-packages/artifactory_built.yml b/npm-packages/artifactory_built.yml index b8c7e6d..9290545 100644 --- a/npm-packages/artifactory_built.yml +++ b/npm-packages/artifactory_built.yml @@ -1,22 +1,23 @@ +#do artifactory connections +include: '/npm-packages/artifactory_connect.yml' + artifactory: stage: deploy - tags: - - docker image: $ACR_URL/node:18.12.0 + #needed to restore the artifats from the build stage dependencies: - build + # avoid restoring git repository variables: GIT_STRATEGY: none script: - #set root user - - npm -g config set user root - # install jfrog cli. Use cache on .npm folder - - npm install -g jfrog-cli-go --cache .npm --prefer-offline #create a publish package - 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 + - jfrog rt bp $CI_PROJECT_NAME $CI_JOB_ID + tags: + - docker only: - tags \ No newline at end of file diff --git a/npm-packages/build_typescript.yml b/npm-packages/build_typescript.yml index 249a18b..744a22b 100644 --- a/npm-packages/build_typescript.yml +++ b/npm-packages/build_typescript.yml @@ -1,32 +1,20 @@ -cache: - untracked: true - key: npm - policy: pull-push - paths: - - dist/ - - root/.jfrog/ - - .npm/ - - usr/local/lib/node_modules/ +#do artifactory connections +include: '/npm-packages/artifactory_connect.yml' + build: + image: $ACR_URL/node:18.12.0 stage: build + # cache build for the next jobs artifacts: - untracked: true expire_in: 1 day - tags: - - docker - image: $ACR_URL/node:18.12.0 - script: - #set root user - - npm -g config set user root - # install jfrog cli. Use cache on .npm folder - - npm install -g jfrog-cli-go --cache .npm --prefer-offline - # load artifactory config from base64 encoded string - - jfrog config import $ARTIFACTORY_CI_CONFIGURATION - # set server id - - jfrog rt use $ACR_SERVER_ID + paths: + - dist/**/* + script: # install dependencies - jfrog rt npm-install --build-name=$CI_PROJECT_NAME --build-number=$CI_JOB_ID # build the package - - npm run build + - npm run build + tags: + - docker only: - - tags + - tags \ No newline at end of file -- GitLab