diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7af5d90c164c0de33118d4f1f3197409882789b2..862f7edab834dcf90d58c3ee9adf9789ad23d399 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,3 @@ -variables: - GITLAB_TOKEN: '${CI_JOB_TOKEN}' - NODE_IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}--node - image: ${CI_REGISTRY}/devops/images/usgs/node:lts # Do not run for merge requests @@ -12,7 +8,6 @@ workflow: stages: - init - - node-image - build - test - publish @@ -36,31 +31,6 @@ Init: - npm ci stage: init -#### -# Stage: Node Image -#### - -Build Node Image: - image: ${CI_REGISTRY}/devops/images/usgs/docker:20 - needs: [] - script: - - | - docker build \ - --build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:lts \ - --file "Dockerfile" \ - --pull \ - --tag ${NODE_IMAGE_NAME} \ - . - - docker push ${NODE_IMAGE_NAME} - services: - - alias: docker - name: ${CI_REGISTRY}/devops/images/usgs/docker:20-dind - stage: node-image - tags: - - build - variables: - DOCKER_DRIVER: overlay2 - #### # Stage: Build #### @@ -125,23 +95,22 @@ Angular Unit Tests: #### Publish npm: - image: ${NODE_IMAGE_NAME} only: - tags needs: + - Angular Unit Tests - Audit - Audit Angular - Init - Build Angular - Lint Project script: - - git config user.email "${GITLAB_USER_EMAIL}" - - git config user.name "${GITLAB_USER_NAME}" - | cat <<-EO_CONFIG > .npmrc @${CI_PROJECT_ROOT_NAMESPACE}:registry=https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/ //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN} + git-tag-version=false EO_CONFIG - - npx standard-version --release-as ${CI_COMMIT_TAG} --skip.commit --skip.changelog + - npm --no-git-tag-version version "${CI_COMMIT_TAG}"; - npm publish --access public stage: publish diff --git a/.npmrc b/.npmrc index 9292540cc0294d3a0c90c62202e44cdd9f406db2..fcdbb5524a8bff8905b96f274821a3c8f1c5f6f4 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ @ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/ -//code.usgs.gov/api/v4/packages/npm/:_authToken=${GITLAB_TOKEN} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 46b295481e1a099d9449d540fbe9a1c3e9a2d278..0000000000000000000000000000000000000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -ARG FROM_IMAGE=usgs/node:latest - -FROM ${FROM_IMAGE} - -USER root - -RUN apt-get install git -y - -USER usgs-user diff --git a/package.json b/package.json index 5d1181932c7cf556419078a75274e4c9510688ac..1863b6c8c125612c75a2299f0d641fa10889a86d 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,5 @@ "dependencies": { "@ghsc/nshmp-utils-ts": "^3.0.0", "d3": "^7.6.1" - }, - "publishConfig": { - "@ghsc:registry": "https://code.usgs.gov/api/v4/projects/4335/packages/npm/" } }