Skip to content

Commit

Permalink
Bugfixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
fcoclavero committed Aug 26, 2020
1 parent 1aaaf48 commit ff1d313
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 23 deletions.
19 changes: 0 additions & 19 deletions .vscode/settings.json

This file was deleted.

5 changes: 3 additions & 2 deletions cloud-sql-proxy/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const core = __importStar(__webpack_require__(470));
const child_process_1 = __webpack_require__(129);
const setupGcloud = __importStar(__webpack_require__(702));
const path_1 = __webpack_require__(622);
/**
* Executes the main action. It includes the main business logic and is the
* primary entry point. It is documented inline.
Expand All @@ -131,9 +132,9 @@ function run() {
if (!authenticated) {
core.setFailed('Error authenticating the Cloud SDK.');
}
const child = child_process_1.spawn('cloud-sql-proxy/lib/cloud_sql_proxy', [`-instances=${instanceConnectionName}=tcp:${port}`], {
const child = child_process_1.spawn('./cloud_sql_proxy', [`-instances=${instanceConnectionName}=tcp:${port}`], {
cwd: __webpack_require__.ab + "lib",
detached: true,
stdio: 'inherit',
});
child.unref();
}
Expand Down
Binary file added cloud-sql-proxy/dist/lib/cloud_sql_proxy
Binary file not shown.
5 changes: 3 additions & 2 deletions cloud-sql-proxy/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as core from '@actions/core';
import { spawn } from 'child_process';
import * as setupGcloud from '../../setupGcloudSDK/dist/index';
import { resolve } from 'path';

/**
* Executes the main action. It includes the main business logic and is the
Expand Down Expand Up @@ -30,11 +31,11 @@ async function run(): Promise<void> {
}

const child = spawn(
'cloud-sql-proxy/lib/cloud_sql_proxy',
'./cloud_sql_proxy',
[`-instances=${instanceConnectionName}=tcp:${port}`],
{
cwd: resolve(__dirname, '../lib'),
detached: true,
stdio: 'inherit',
},
);
child.unref();
Expand Down

0 comments on commit ff1d313

Please sign in to comment.