From 8edb7faf5ff8d5067cb1a9ec89e8ec0981a249c3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 10:38:52 -0700
Subject: [PATCH 1/6] test
---
.gitlab-ci.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7af5d90..683a2d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,12 +129,14 @@ Publish npm:
only:
- tags
needs:
- - Audit
- - Audit Angular
+ # - Audit
+ # - Audit Angular
- Init
- - Build Angular
- - Lint Project
+ # - Build Angular
+ # - Lint Project
+ - Build Node Image
script:
+ - ls -al
- git config user.email "${GITLAB_USER_EMAIL}"
- git config user.name "${GITLAB_USER_NAME}"
- |
--
GitLab
From 42461f857518aff82652efa9b649a38f32787a83 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 10:48:51 -0700
Subject: [PATCH 2/6] no git on publish
---
.gitlab-ci.yml | 43 ++++++-------------------------------------
1 file changed, 6 insertions(+), 37 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 683a2d0..75043fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
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
@@ -12,7 +11,6 @@ workflow:
stages:
- init
- - node-image
- build
- test
- publish
@@ -36,31 +34,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
####
@@ -129,21 +102,17 @@ Publish npm:
only:
- tags
needs:
- # - Audit
- # - Audit Angular
+ - Audit
+ - Audit Angular
- Init
- # - Build Angular
- # - Lint Project
- - Build Node Image
+ - Build Angular
+ - Lint Project
script:
- - ls -al
- - 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}
EO_CONFIG
- - npx standard-version --release-as ${CI_COMMIT_TAG} --skip.commit --skip.changelog
- - npm publish --access public
+ - npm --no-git-tag-version version "${CI_COMMIT_TAG}";
+ - npm publish
stage: publish
--
GitLab
From a70b795aeb20d31f467f553503f5b0c9ed922c61 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 10:49:09 -0700
Subject: [PATCH 3/6] remove dockerfile
---
Dockerfile | 9 ---------
1 file changed, 9 deletions(-)
delete mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 46b2954..0000000
--- 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
--
GitLab
From 437a80ecff1630d70e3d42c8733a1a146f181400 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 10:50:18 -0700
Subject: [PATCH 4/6] no git tag
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75043fa..36f99db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,6 +112,7 @@ Publish npm:
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
- npm --no-git-tag-version version "${CI_COMMIT_TAG}";
- npm publish
--
GitLab
From 51bed1934972b3f8f648d9e6b7f24f8ca26fe397 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 10:56:18 -0700
Subject: [PATCH 5/6] remove image
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36f99db..c9e0f21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,7 +98,6 @@ Angular Unit Tests:
####
Publish npm:
- image: ${NODE_IMAGE_NAME}
only:
- tags
needs:
--
GitLab
From f7ed547e4e5f77a36b31291838a24ac54e2f79e1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 Nov 2023 12:05:02 -0700
Subject: [PATCH 6/6] cleanup
---
.gitlab-ci.yml | 6 ++----
.npmrc | 1 -
package.json | 3 ---
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9e0f21..862f7ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-variables:
- GITLAB_TOKEN: '${CI_JOB_TOKEN}'
-
image: ${CI_REGISTRY}/devops/images/usgs/node:lts
# Do not run for merge requests
@@ -101,6 +98,7 @@ Publish npm:
only:
- tags
needs:
+ - Angular Unit Tests
- Audit
- Audit Angular
- Init
@@ -114,5 +112,5 @@ Publish npm:
git-tag-version=false
EO_CONFIG
- npm --no-git-tag-version version "${CI_COMMIT_TAG}";
- - npm publish
+ - npm publish --access public
stage: publish
diff --git a/.npmrc b/.npmrc
index 9292540..fcdbb55 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/package.json b/package.json
index 5d11819..1863b6c 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/"
}
}
--
GitLab