From cd6c14eed5a55e92def79a31faa1cbef39990b9e Mon Sep 17 00:00:00 2001 From: sotojn Date: Thu, 9 Jan 2025 16:20:41 -0700 Subject: [PATCH 1/3] fix broken publish steps in ci --- .github/workflows/publish-master.yml | 2 +- packages/scripts/src/helpers/publish/index.ts | 12 ++------ packages/scripts/src/helpers/scripts.ts | 29 ++----------------- scripts/build-documentation.sh | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/.github/workflows/publish-master.yml b/.github/workflows/publish-master.yml index c5d6c6b1a8c..82c49165986 100644 --- a/.github/workflows/publish-master.yml +++ b/.github/workflows/publish-master.yml @@ -63,7 +63,7 @@ jobs: cache: 'yarn' - name: Build documentation - run: ./scripts/build-documentation.sh # output in website/build + run: yarn && ./scripts/build-documentation.sh # output in website/build - name: Check Output run: find ./website/build - name: Upload artifact diff --git a/packages/scripts/src/helpers/publish/index.ts b/packages/scripts/src/helpers/publish/index.ts index 91fb9e796a7..1478541a07f 100644 --- a/packages/scripts/src/helpers/publish/index.ts +++ b/packages/scripts/src/helpers/publish/index.ts @@ -1,5 +1,5 @@ import { - get, concat, pMap, + concat, pMap, isString, toHumanTime } from '@terascope/utils'; import { PackageInfo } from '../interfaces.js'; @@ -11,7 +11,7 @@ import { } from './utils.js'; import { yarnPublish, yarnRun, remoteDockerImageExists, - dockerBuild, dockerPush, yarnPublishV2, + dockerBuild, dockerPush, getNodeVersionFromImage } from '../scripts.js'; import { getRootInfo, getDevDockerImage, formatList } from '../misc.js'; @@ -69,13 +69,7 @@ async function npmPublish( return pkgInfo.name; } - const rootInfo = getRootInfo(); - if (rootInfo.terascope.version === 2) { - await yarnPublishV2(pkgInfo, tag); - } else { - const registry: string | undefined = get(pkgInfo, 'publishConfig.registry'); - await yarnPublish(pkgInfo, tag, registry); - } + await yarnPublish(pkgInfo, tag); return pkgInfo.name; } diff --git a/packages/scripts/src/helpers/scripts.ts b/packages/scripts/src/helpers/scripts.ts index 1c8f8123287..8000eeb28de 100644 --- a/packages/scripts/src/helpers/scripts.ts +++ b/packages/scripts/src/helpers/scripts.ts @@ -586,42 +586,17 @@ export function mapToArgs(input: ArgsMap): string[] { } /** - * Yarn publish for version 2 + * Yarn publish for yarn versions 2, 3, and 4 */ -export async function yarnPublishV2( - pkgInfo: PackageInfo, - tag = 'latest', -): Promise { - await fork({ - cmd: 'yarn', - args: [ - 'npm', - 'publish', - '--tag', - tag - ], - cwd: pkgInfo.dir, - env: { - NODE_ENV: 'production' - } - }); -} - export async function yarnPublish( pkgInfo: PackageInfo, tag = 'latest', - registry = config.NPM_DEFAULT_REGISTRY ): Promise { await fork({ cmd: 'yarn', args: [ + 'npm', 'publish', - '--non-interactive', - '--new-version', - pkgInfo.version, - '--no-git-tag-version', - '--registry', - registry, '--tag', tag ], diff --git a/scripts/build-documentation.sh b/scripts/build-documentation.sh index 92025c9209a..85b14518f27 100755 --- a/scripts/build-documentation.sh +++ b/scripts/build-documentation.sh @@ -28,7 +28,7 @@ main() { yarn setup && yarn docs && cd website && - yarn install --prod --no-default-rc && + yarn install && yarn run build } From 8c9e56daab6ce8c1765cbedbd5db3aee1a46632f Mon Sep 17 00:00:00 2001 From: sotojn Date: Thu, 9 Jan 2025 16:22:52 -0700 Subject: [PATCH 2/3] bump: (minor) @terascope/scripts@1.9.0 --- e2e/package.json | 2 +- package.json | 2 +- packages/scripts/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/package.json b/e2e/package.json index 6efcc620ca1..82e62297132 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -43,7 +43,7 @@ "ms": "~2.1.3" }, "devDependencies": { - "@terascope/scripts": "~1.8.1", + "@terascope/scripts": "~1.9.0", "@terascope/types": "~1.4.1", "bunyan": "~1.8.15", "elasticsearch-store": "~1.7.1", diff --git a/package.json b/package.json index eb2651d50e4..ce8334bd2ea 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@eslint/js": "~9.16.0", "@swc/core": "1.4.0", "@swc/jest": "~0.2.36", - "@terascope/scripts": "~1.8.1", + "@terascope/scripts": "~1.9.0", "@types/bluebird": "~3.5.42", "@types/convict": "~6.1.6", "@types/elasticsearch": "~5.0.43", diff --git a/packages/scripts/package.json b/packages/scripts/package.json index a2ad5d4153e..4b947bf13e1 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,7 +1,7 @@ { "name": "@terascope/scripts", "displayName": "Scripts", - "version": "1.8.1", + "version": "1.9.0", "description": "A collection of terascope monorepo scripts", "homepage": "https://github.com/terascope/teraslice/tree/master/packages/scripts#readme", "bugs": { From 2af44d91f5f6bbff8e4423298206aa1b60ed8491 Mon Sep 17 00:00:00 2001 From: sotojn Date: Thu, 9 Jan 2025 16:29:40 -0700 Subject: [PATCH 3/3] fix yarn lock --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ce5c9f3b997..5c315fcf1fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2941,7 +2941,7 @@ __metadata: languageName: unknown linkType: soft -"@terascope/scripts@npm:~1.8.1, @terascope/scripts@workspace:packages/scripts": +"@terascope/scripts@npm:~1.9.0, @terascope/scripts@workspace:packages/scripts": version: 0.0.0-use.local resolution: "@terascope/scripts@workspace:packages/scripts" dependencies: @@ -6261,7 +6261,7 @@ __metadata: version: 0.0.0-use.local resolution: "e2e@workspace:e2e" dependencies: - "@terascope/scripts": "npm:~1.8.1" + "@terascope/scripts": "npm:~1.9.0" "@terascope/types": "npm:~1.4.1" bunyan: "npm:~1.8.15" elasticsearch-store: "npm:~1.7.1" @@ -13226,7 +13226,7 @@ __metadata: "@eslint/js": "npm:~9.16.0" "@swc/core": "npm:1.4.0" "@swc/jest": "npm:~0.2.36" - "@terascope/scripts": "npm:~1.8.1" + "@terascope/scripts": "npm:~1.9.0" "@types/bluebird": "npm:~3.5.42" "@types/convict": "npm:~6.1.6" "@types/elasticsearch": "npm:~5.0.43"