From 499118d2104e8be56c5b11512355591a299b2da6 Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 09:16:27 -0600 Subject: [PATCH 1/8] Add npm config file --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..b476158669 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +//npm.pkg.github.com/:_authToken=$GITHUB_OAUTH_TOKEN From d024479f474454cedcd38c573908330db74f82ae Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 09:22:06 -0600 Subject: [PATCH 2/8] Update package.json specification of private github package --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dded264830..2f8aa66722 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "optionalDependencies": { "docs-sourcer": "git+ssh://git@github.com/gruntwork-io/docs-sourcer.git#v0.2", - "ts-commons": "gruntwork-io/ts-commons#v1.0.0" + "ts-commons": "github:gruntwork-io/ts-commons#v1.0.0" }, "browserslist": { "production": [ diff --git a/yarn.lock b/yarn.lock index 62a58ffa93..b510b65740 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11185,7 +11185,7 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -ts-commons@gruntwork-io/ts-commons#v1.0.0: +"ts-commons@github:gruntwork-io/ts-commons#v1.0.0": version "1.0.0" resolved "git+ssh://git@github.com/gruntwork-io/ts-commons.git#1a56fec327ea602b4472663599c63ec6118b7f01" From 91277a2da85a814f5c7d3a6650d9fc8c89136cbf Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 09:38:58 -0600 Subject: [PATCH 3/8] Replace npm config with yarn config --- .npmrc | 1 - .yarnrc.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .npmrc create mode 100644 .yarnrc.yml diff --git a/.npmrc b/.npmrc deleted file mode 100644 index b476158669..0000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -//npm.pkg.github.com/:_authToken=$GITHUB_OAUTH_TOKEN diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000000..2f102781b9 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +npmAuthToken: "${GITHUB_OAUTH_TOKEN}" From a21be0f5c8bd40298a0d60dbb6086e0f519a206a Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 09:58:14 -0600 Subject: [PATCH 4/8] [WIP] Update yarnrc --- .yarnrc.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 2f102781b9..58e9506372 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1 +1,6 @@ -npmAuthToken: "${GITHUB_OAUTH_TOKEN}" +npmAuthToken: ${GITHUB_OAUTH_TOKEN} + +npmRegistries: + //npm.pkg.github.com: + npmAlwaysAuth: true + npmAuthToken: ${GITHUB_OAUTH_TOKEN} From fb83731309aff26a9c987b40b8336545a21a3a38 Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 10:22:33 -0600 Subject: [PATCH 5/8] Use yarnrc for v1 of yarn --- .yarnrc | 3 +++ .yarnrc.yml | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 .yarnrc delete mode 100644 .yarnrc.yml diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 0000000000..bf5c0551d4 --- /dev/null +++ b/.yarnrc @@ -0,0 +1,3 @@ +# This sets the authentication token to use for the GitHub package registry +# "@{SCOPE}:registry" "https://npm.pkg.github.com" +npm.pkg.github.com/:_authToken ${GITHUB_OAUTH_TOKEN} diff --git a/.yarnrc.yml b/.yarnrc.yml deleted file mode 100644 index 58e9506372..0000000000 --- a/.yarnrc.yml +++ /dev/null @@ -1,6 +0,0 @@ -npmAuthToken: ${GITHUB_OAUTH_TOKEN} - -npmRegistries: - //npm.pkg.github.com: - npmAlwaysAuth: true - npmAuthToken: ${GITHUB_OAUTH_TOKEN} From 6448f9422fe557f0bbe3526ec0d9d7f5b72000c3 Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 11:23:41 -0600 Subject: [PATCH 6/8] Update CI dependency install step --- .circleci/config.yml | 2 +- .yarnrc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .yarnrc diff --git a/.circleci/config.yml b/.circleci/config.yml index a4b16f8770..40af518b5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ references: build_docs: &build_docs run: name: build - command: yarn --ignore-optional && yarn build + command: yarn && yarn build test_docs: &test_docs run: diff --git a/.yarnrc b/.yarnrc deleted file mode 100644 index bf5c0551d4..0000000000 --- a/.yarnrc +++ /dev/null @@ -1,3 +0,0 @@ -# This sets the authentication token to use for the GitHub package registry -# "@{SCOPE}:registry" "https://npm.pkg.github.com" -npm.pkg.github.com/:_authToken ${GITHUB_OAUTH_TOKEN} From 81569cf2825488068290463a8178a6b496978cf0 Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 11:32:11 -0600 Subject: [PATCH 7/8] Remove unnecessary context for build steps --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40af518b5a..8971ff7818 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -156,16 +156,12 @@ workflows: validate_build: jobs: - validate-build: - context: - - GitHub OAuth Token filters: branches: ignore: master stage_deployment: jobs: - validate-build: - context: - - GitHub OAuth Token filters: branches: only: master @@ -181,8 +177,6 @@ workflows: prod_deployment: jobs: - validate-build: - context: - - GitHub OAuth Token filters: tags: only: /^v.*/ From 8d2bb938461354def89ab95936fa77fd2177b6c6 Mon Sep 17 00:00:00 2001 From: Oreoluwa Agunbiade Date: Tue, 21 Mar 2023 11:33:51 -0600 Subject: [PATCH 8/8] Revert package.json changes --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2f8aa66722..dded264830 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "optionalDependencies": { "docs-sourcer": "git+ssh://git@github.com/gruntwork-io/docs-sourcer.git#v0.2", - "ts-commons": "github:gruntwork-io/ts-commons#v1.0.0" + "ts-commons": "gruntwork-io/ts-commons#v1.0.0" }, "browserslist": { "production": [ diff --git a/yarn.lock b/yarn.lock index b510b65740..62a58ffa93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11185,7 +11185,7 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== -"ts-commons@github:gruntwork-io/ts-commons#v1.0.0": +ts-commons@gruntwork-io/ts-commons#v1.0.0: version "1.0.0" resolved "git+ssh://git@github.com/gruntwork-io/ts-commons.git#1a56fec327ea602b4472663599c63ec6118b7f01"