skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(changelog): fix missing module for adding streams (#1738)

Browse Source
This commit is contained in:
Paul Gschwendtner
2016-11-08 21:28:56 +01:00
committed by Jeremy Elbourn
parent 4203d0970e
commit 640dbb6692
2 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/e2e.sh
-21
View File
@@ -1,21 +0,0 @@
#!/usr/bin/env bash
export MODE=e2e
export LOGS_DIR=/tmp/angular-material2-build/logs
export SAUCE_USERNAME=angular-ci
export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
export TRAVIS_JOB_NUMBER=12345
export BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
mkdir -p $LOGS_DIR
rm -f $BROWSER_PROVIDER_READY_FILE
# Force cleanup (shouldn't be necessary)
killall angular-cli
./scripts/sauce/sauce_connect_teardown.sh
# Run the script
./scripts/ci/build-and-test.sh
# Actual cleanup
./scripts/sauce/sauce_connect_teardown.sh
killall angular-cli
scripts/release/changelog.js
+22 -15
View File
@@ -7,7 +7,7 @@
*/
const fs = require('fs');
const addStream = require('add-stream');
const merge2 = require('merge2');
const changelog = require('conventional-changelog');
const spawnSync = require('child_process').spawnSync;
const npmVersion = require('../../package.json').version;
@@ -17,7 +17,7 @@ const npmVersion = require('../../package.json').version;
* By default, it will only create the changelog from the latest tag to head and prepends it to the changelog.
*/
const isForce = process.argv.indexOf('--force') !== -1;
const inStream = fs.createReadStream('CHANGELOG.md');
const previousChangelog = fs.createReadStream('CHANGELOG.md');
const gitTags = getAvailableTags();
// Whether the npm version is later than the most recent tag.
@@ -27,33 +27,40 @@ const currentTag = isNpmLatest ? npmVersion : gitTags[0];
// When the npm version is the latest use the most recent tag. Otherwise use the previous tag.
const previousTag = isNpmLatest ? gitTags[0] : gitTags[1];
inStream.on('error', function(err) {
console.error('An error occurred, while reading the previous changelog file.\n' +
'If there is no previous changelog, then you should create an empty file or use the `--force` flag.\n' + err);
if (!isForce) {
previousChangelog.on('error', function(err) {
console.error('An error occurred, while reading the previous changelog file.\n' +
'If there is changelog file, you should create an empty file or use the `--force` flag.\n' + err);
process.exit(1);
});
process.exit(1);
});
}
var config = {
const config = {
preset: 'angular',
releaseCount: isForce ? 0 : 1
};
var context = {
const context = {
currentTag: currentTag,
previousTag: previousTag
};
var stream = changelog(config, context)
.on('error', function(err) {
console.error('An error occurred while generating the changelog: ' + err);
})
.pipe(!isForce && addStream(inStream) || getOutputStream());
let stream = changelog(config, context).on('error', function(err) {
console.error('An error occurred while generating the changelog: ' + err);
});
if (!isForce) {
// Append the previous changelog to the new generated one.
stream = merge2(stream, previousChangelog);
} else {
stream.pipe(getOutputStream())
}
// When we are pre-pending the new changelog, then we need to wait for the input stream to be ending,
// otherwise we can't write into the same destination.
if (!isForce) {
inStream.on('end', function() {
previousChangelog.on('end', function() {
stream.pipe(getOutputStream());
});
}