Skip to content

Commit

Permalink
retry
Browse files Browse the repository at this point in the history
  • Loading branch information
sofisl committed Sep 7, 2023
1 parent 8f8cd73 commit 0bbeedb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ jobs:
- run: cd gax; npm run docs
- uses: JustinBeckwith/linkinator-action@v1
with:
paths: docs/
paths: gax/docs/
2 changes: 1 addition & 1 deletion gax/test/showcase-echo-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions gax/test/system-test/test.clientlibs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit 0bbeedb

Please sign in to comment.