apoloz/cache-extensions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix arguments

Browse Source
This commit is contained in:
Shivam Mathur
2020-02-29 15:42:01 +05:30
parent a3c9016503
commit b354d92cc6
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/cache.test.ts
View File

@@ -12,7 +12,7 @@ jest.mock('../src/cache', () => ({
const script_path = 'extensions.sh';
return (
'bash ' + script_path + ' "' + extensions + '-' + key + '" ' + version
'bash ' + script_path + ' "' + extensions + '" ' + key + ' ' + version
);
}
)
@@ -42,13 +42,13 @@ describe('Install', () => {
setEnv('7.0', 'xdebug, pcov', 'cache-v1');
// @ts-ignore
const script: string = await install.run();
expect(script).toContain('bash extensions.sh "xdebug, pcov-cache-v1" 7.0');
expect(script).toContain('bash extensions.sh "xdebug, pcov" cache-v1 7.0');
});
it('Test Run', async () => {
setEnv('7.4', 'xdebug, zip', 'cache-v2');
// @ts-ignore
const script: string = await install.run();
expect(script).toContain('bash extensions.sh "xdebug, zip-cache-v2" 7.4');
expect(script).toContain('bash extensions.sh "xdebug, zip" cache-v2 7.4');
});
});

2
dist/index.js vendored
View File

@@ -1555,7 +1555,7 @@ function run() {
const extensions = yield utils.getInput('extensions', true);
const key = yield utils.getInput('key', true);
const script_path = path.join(__dirname, '../src/extensions.sh');
yield exec_1.exec('bash ' + script_path + ' "' + extensions + '-' + key + '" ' + version);
yield exec_1.exec('bash ' + script_path + ' "' + extensions + '" ' + key + ' ' + version);
}
catch (error) {
core.setFailed(error.message);

2
src/cache.ts
View File

@@ -14,7 +14,7 @@ export async function run(): Promise<void> {
const key: string = await utils.getInput('key', true);
const script_path: string = path.join(__dirname, '../src/extensions.sh');
await exec(
'bash ' + script_path + ' "' + extensions + '-' + key + '" ' + version
'bash ' + script_path + ' "' + extensions + '" ' + key + ' ' + version
);
} catch (error) {
core.setFailed(error.message);

5
src/extensions.sh
View File

@@ -44,8 +44,9 @@ get_apiv() {
esac
}
version=$2
extensions=$1
key=$2
version=$3
os=$(uname -s)
if [ "$os" = "Linux" ]; then
flags='-Po'
@@ -68,6 +69,6 @@ else
os="Windows"
dir='C:\\tools\\php\\ext'
fi
key="$os"-ext-"$version"-$(echo -n "$extensions" | openssl dgst -sha256 | cut -d ' ' -f 2)
key="$os"-ext-"$version"-$(echo -n "$extensions-$key" | openssl dgst -sha256 | cut -d ' ' -f 2)
echo "::set-output name=dir::$dir"
echo "::set-output name=key::$key"