diff --git a/.licenses/npm/@actions/cache.dep.yml b/.licenses/npm/@actions/cache.dep.yml index dcc3afa..e6ae37e 100644 Binary files a/.licenses/npm/@actions/cache.dep.yml and b/.licenses/npm/@actions/cache.dep.yml differ diff --git a/RELEASES.md b/RELEASES.md index 50cfd91..359ded7 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -70,3 +70,6 @@ ### 3.2.4 - Added option to fail job on cache miss. + +### 3.2.5 +- Added fix to prevent from setting MYSYS environment variable globally. diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js index 64766d1..45c628e 100644 --- a/dist/restore-only/index.js +++ b/dist/restore-only/index.js @@ -38230,14 +38230,12 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const exec_1 = __webpack_require__(986); -const core_1 = __webpack_require__(470); const io = __importStar(__webpack_require__(1)); const fs_1 = __webpack_require__(747); const path = __importStar(__webpack_require__(622)); const utils = __importStar(__webpack_require__(15)); const constants_1 = __webpack_require__(931); const IS_WINDOWS = process.platform === 'win32'; -core_1.exportVariable('MSYS', 'winsymlinks:nativestrict'); // Returns tar path and type: BSD or GNU function getTarPath() { return __awaiter(this, void 0, void 0, function* () { @@ -38427,7 +38425,10 @@ function execCommands(commands, cwd) { return __awaiter(this, void 0, void 0, function* () { for (const command of commands) { try { - yield exec_1.exec(command, undefined, { cwd }); + yield exec_1.exec(command, undefined, { + cwd, + env: Object.assign(Object.assign({}, process.env), { MSYS: 'winsymlinks:nativestrict' }) + }); } catch (error) { throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`); diff --git a/dist/restore/index.js b/dist/restore/index.js index d15f678..c2dd9b8 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -38138,14 +38138,12 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const exec_1 = __webpack_require__(986); -const core_1 = __webpack_require__(470); const io = __importStar(__webpack_require__(1)); const fs_1 = __webpack_require__(747); const path = __importStar(__webpack_require__(622)); const utils = __importStar(__webpack_require__(15)); const constants_1 = __webpack_require__(931); const IS_WINDOWS = process.platform === 'win32'; -core_1.exportVariable('MSYS', 'winsymlinks:nativestrict'); // Returns tar path and type: BSD or GNU function getTarPath() { return __awaiter(this, void 0, void 0, function* () { @@ -38335,7 +38333,10 @@ function execCommands(commands, cwd) { return __awaiter(this, void 0, void 0, function* () { for (const command of commands) { try { - yield exec_1.exec(command, undefined, { cwd }); + yield exec_1.exec(command, undefined, { + cwd, + env: Object.assign(Object.assign({}, process.env), { MSYS: 'winsymlinks:nativestrict' }) + }); } catch (error) { throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`); diff --git a/dist/save-only/index.js b/dist/save-only/index.js index 39ba9bc..c678c5b 100644 --- a/dist/save-only/index.js +++ b/dist/save-only/index.js @@ -38189,14 +38189,12 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const exec_1 = __webpack_require__(986); -const core_1 = __webpack_require__(470); const io = __importStar(__webpack_require__(1)); const fs_1 = __webpack_require__(747); const path = __importStar(__webpack_require__(622)); const utils = __importStar(__webpack_require__(15)); const constants_1 = __webpack_require__(931); const IS_WINDOWS = process.platform === 'win32'; -core_1.exportVariable('MSYS', 'winsymlinks:nativestrict'); // Returns tar path and type: BSD or GNU function getTarPath() { return __awaiter(this, void 0, void 0, function* () { @@ -38386,7 +38384,10 @@ function execCommands(commands, cwd) { return __awaiter(this, void 0, void 0, function* () { for (const command of commands) { try { - yield exec_1.exec(command, undefined, { cwd }); + yield exec_1.exec(command, undefined, { + cwd, + env: Object.assign(Object.assign({}, process.env), { MSYS: 'winsymlinks:nativestrict' }) + }); } catch (error) { throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`); diff --git a/dist/save/index.js b/dist/save/index.js index c65c686..adf43e8 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -38133,14 +38133,12 @@ var __importStar = (this && this.__importStar) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); const exec_1 = __webpack_require__(986); -const core_1 = __webpack_require__(470); const io = __importStar(__webpack_require__(1)); const fs_1 = __webpack_require__(747); const path = __importStar(__webpack_require__(622)); const utils = __importStar(__webpack_require__(15)); const constants_1 = __webpack_require__(931); const IS_WINDOWS = process.platform === 'win32'; -core_1.exportVariable('MSYS', 'winsymlinks:nativestrict'); // Returns tar path and type: BSD or GNU function getTarPath() { return __awaiter(this, void 0, void 0, function* () { @@ -38330,7 +38328,10 @@ function execCommands(commands, cwd) { return __awaiter(this, void 0, void 0, function* () { for (const command of commands) { try { - yield exec_1.exec(command, undefined, { cwd }); + yield exec_1.exec(command, undefined, { + cwd, + env: Object.assign(Object.assign({}, process.env), { MSYS: 'winsymlinks:nativestrict' }) + }); } catch (error) { throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`); diff --git a/package-lock.json b/package-lock.json index f806a8c..4ef558d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "cache", - "version": "3.2.4", + "version": "3.2.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cache", - "version": "3.2.4", + "version": "3.2.5", "license": "MIT", "dependencies": { - "@actions/cache": "^3.1.2", + "@actions/cache": "^3.1.3", "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.2" @@ -36,9 +36,9 @@ } }, "node_modules/@actions/cache": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.2.tgz", - "integrity": "sha512-3XeKcXIonfIbqvW7gPm/VLOhv1RHQ1dtTgSBCH6OUhCgSTii9bEVgu0PIms7UbLnXeMCKFzECfpbud8fJEvBbQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.3.tgz", + "integrity": "sha512-5YbATJUS6nVs9EkpK7JaliC3G5koKdJT99NLreL0gJlznudzZzXGNIheW5+HUT9C2DBvubOxYIyfX4v2UpZWrA==", "dependencies": { "@actions/core": "^1.10.0", "@actions/exec": "^1.0.1", @@ -9722,9 +9722,9 @@ }, "dependencies": { "@actions/cache": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.2.tgz", - "integrity": "sha512-3XeKcXIonfIbqvW7gPm/VLOhv1RHQ1dtTgSBCH6OUhCgSTii9bEVgu0PIms7UbLnXeMCKFzECfpbud8fJEvBbQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.3.tgz", + "integrity": "sha512-5YbATJUS6nVs9EkpK7JaliC3G5koKdJT99NLreL0gJlznudzZzXGNIheW5+HUT9C2DBvubOxYIyfX4v2UpZWrA==", "requires": { "@actions/core": "^1.10.0", "@actions/exec": "^1.0.1", diff --git a/package.json b/package.json index 61aa6e5..c5cfcc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cache", - "version": "3.2.4", + "version": "3.2.5", "private": true, "description": "Cache dependencies and build outputs", "main": "dist/restore/index.js", @@ -23,7 +23,7 @@ "author": "GitHub", "license": "MIT", "dependencies": { - "@actions/cache": "^3.1.2", + "@actions/cache": "^3.1.3", "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.2"