Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump marked from 0.3.9 to 0.3.18 #100

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Bump marked from 0.3.9 to 0.3.18 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36e63ac
+fix
IvanPopov Nov 10, 2019
97dd3ca
Bump marked from 0.3.9 to 0.3.18
dependabot[bot] Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/grunt/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,6 @@ module.exports = function (grunt) {
variables[resourceName] = info.resources[resourceName] = JSON.stringify(result);
});


config.find("//PropertyGroup/Dependencies/Attachment").forEach(function (attachment, i) {
var attachmentName = attachment.getAttribute("Name") || ("$" + i);
var result = loadAttachment(config, attachment, info);
Expand Down Expand Up @@ -1084,7 +1083,7 @@ module.exports = function (grunt) {

var srcFiles = meta.data;

for (i = 0; i < srcFiles.length; ++i) {
for (var i = 0; i < srcFiles.length; ++i) {
if (!isDev()) {
copy(srcFiles[i].src, srcFiles[i].dst); //записываем файл в destFolder
}
Expand Down
8 changes: 4 additions & 4 deletions lib/grunt/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ module.exports = {

function getTagOfCurrentCommit() {
var gitTagResult = shell.exec('git describe --exact-match', { silent: true });
var gitTagOutput = gitTagResult.output.trim();
var gitTagOutput = gitTagResult.stdout.trim();
var branchVersionPattern = new RegExp(package.branchVersion.replace('.', '\\.').replace('*', '\\d+'));
if (gitTagResult.code === 0 && gitTagOutput.match(branchVersionPattern)) {
return gitTagOutput;
Expand All @@ -71,7 +71,7 @@ module.exports = {
grep = 'findstr';
}

var tagMessage = shell.exec('git cat-file -p ' + tagName + ' | ' + grep + ' "codename"', { silent: true }).output;
var tagMessage = shell.exec('git cat-file -p ' + tagName + ' | ' + grep + ' "codename"', { silent: true }).stdout;
var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
if (!codeName) {
throw new Error("Could not extract release code name. The message of tag " + tagName +
Expand All @@ -81,7 +81,7 @@ module.exports = {
}

function getSnapshotVersion() {
var oldTags = shell.exec('git tag -l v' + package.branchVersion, { silent: true }).output.trim().split('\n');
var oldTags = shell.exec('git tag -l v' + package.branchVersion, { silent: true }).stdout.trim().split('\n');
// ignore non semver versions.
oldTags = oldTags.filter(function (version) {
return version && semver.valid(version);
Expand All @@ -102,7 +102,7 @@ module.exports = {

function getSnapshotSuffix() {
var jenkinsBuild = process.env.TRAVIS_BUILD_NUMBER || process.env.BUILD_NUMBER || 'local';
var hash = shell.exec('git rev-parse --short HEAD', { silent: true }).output.replace('\n', '');
var hash = shell.exec('git rev-parse --short HEAD', { silent: true }).stdout.replace('\n', '');
return 'build.' + jenkinsBuild + '+sha.' + hash;
}
},
Expand Down
Loading