diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7feb49ef0..77fe7fc6b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -98,4 +98,4 @@ jobs: - run: cd gax; npm run docs - uses: JustinBeckwith/linkinator-action@v1 with: - paths: docs/ + paths: gax/docs/ diff --git a/gax/test/showcase-echo-client/package.json b/gax/test/showcase-echo-client/package.json index 6c9213210..ac3bb3829 100644 --- a/gax/test/showcase-echo-client/package.json +++ b/gax/test/showcase-echo-client/package.json @@ -30,7 +30,7 @@ "scripts": { "compile": "tsc -p . && cp -r protos build/", "compile-protos": "compileProtos src", - "prefetch": "rm -rf node_modules package-lock.json google-gax*.tgz gapic-tools*.tgz && cd ../.. && npm pack && mv google-gax*.tgz test/showcase-echo-client/google-gax.tgz && cd tools && npm install && npm pack && mv gapic-tools*.tgz ../test/showcase-echo-client/gapic-tools.tgz", + "prefetch": "rm -rf node_modules package-lock.json google-gax*.tgz gapic-tools*.tgz && cd ../.. && npm pack && mv google-gax*.tgz test/showcase-echo-client/google-gax.tgz && cd ../tools && npm install && npm pack && mv gapic-tools*.tgz ../test/showcase-echo-client/gapic-tools.tgz", "prepare": "npm run compile-protos && npm run compile" }, "dependencies": { diff --git a/gax/test/system-test/test.clientlibs.ts b/gax/test/system-test/test.clientlibs.ts index 9391df900..314974b62 100644 --- a/gax/test/system-test/test.clientlibs.ts +++ b/gax/test/system-test/test.clientlibs.ts @@ -37,7 +37,7 @@ const gaxDir = path.resolve(__dirname, '..', '..', '..'); // eslint-disable-next-line @typescript-eslint/no-var-requires const pkg = require('../../../package.json'); const gaxTarball = path.join(gaxDir, `${pkg.name}-${pkg.version}.tgz`); -const toolsPkg = require('../../../tools/package.json'); +const toolsPkg = require('../../../../tools/package.json'); const toolsBasename = `${toolsPkg.name}-${toolsPkg.version}.tgz`; const toolsTarball = path.join(gaxDir, toolsBasename); @@ -182,15 +182,15 @@ describe('Run system tests for some libraries', () => { } console.log('Packing gapic-tools...'); await execa('npm', ['install'], { - cwd: path.join(gaxDir, 'tools'), + cwd: path.join(gaxDir, '..', 'tools'), stdio: 'inherit', }); await execa('npm', ['pack'], { - cwd: path.join(gaxDir, 'tools'), + cwd: path.join(gaxDir, '..', 'tools'), stdio: 'inherit', }); await fs.promises.rename( - path.join(gaxDir, 'tools', toolsBasename), + path.join(gaxDir, 'tools', '..', toolsBasename), toolsTarball ); if (!fs.existsSync(toolsTarball)) {