Skip to content

Commit 27f0f91

Browse files
committed
fixup! add autotools tarball support
1 parent 4abd4c0 commit 27f0f91

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Command line utility for creating new releases of libuv.
66

77
1. Make sure you have the most up-to-date version of this tool and the libuv
88
branch that will be used to create the release.
9-
2. Currently, the release tool requires Node.js v12.10.x. You may want to use
10-
something like `nvm` to change Node versions.
9+
2. Currently, the release tool requires Node.js v12 or later. You may want to
10+
use something like `nvm` to change Node versions.
1111
3. Run `node ./release.js --version x.x.x --dir path --remote name`, where
1212
`x.x.x` is the version of libuv you are creating, `path` is the location of
1313
the libuv core repository on your machine, and `name` is the libuv core git

release.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var SCHEDULE = [
3535
createDistDirectory,
3636
createCMakeTarBall,
3737
createAutotoolsTarBall,
38-
signTarballs,
39-
createWebsiteDirectory,
40-
pushTag,
41-
pushBranch,
42-
uploadTarBalls,
38+
//signTarballs,
39+
//createWebsiteDirectory,
40+
//pushTag,
41+
//pushBranch,
42+
//uploadTarBalls,
4343
done
4444
];
4545

@@ -333,7 +333,7 @@ function tagRelease() {
333333
var releaseTag = state.releaseTag = ver.format(state.version);
334334
var message = relnotes.reflow(state.releaseNotes, 79);
335335

336-
gitClient.tag([releaseTag, '-as'], message, nextOrRetry);
336+
gitClient.tag([releaseTag, '-a'], message, nextOrRetry);
337337
}
338338

339339
function stageVersionFiles() {
@@ -402,15 +402,11 @@ function createCMakeTarBall() {
402402

403403
function createAutotoolsTarBall() {
404404
var tag = ver.format(state.releaseVersion);
405-
try {
406405
var distver = format('%d.%d.%d',
407406
state.releaseVersion.major,
408407
state.releaseVersion.minor,
409408
state.releaseVersion.patch);
410-
} catch (err) {
411-
return pauseRetry(err);
412-
}
413-
child_process.execFile('./autogen.sh', [], { stdio: 'inherit', cwd: dir},
409+
child_process.execFile('./autogen.sh', [], { stdio: 'inherit', cwd: dir },
414410
function(err, stdout, stderr) {
415411
if (err) {
416412
console.log(stdout);
@@ -424,7 +420,7 @@ function createAutotoolsTarBall() {
424420
return pauseRetry(err);
425421
}
426422
child_process.execFile(dir + '/configure', [],
427-
{ stdio: 'inherit', cwd: builddir},
423+
{ stdio: 'inherit', cwd: builddir },
428424
function(err, stdout, stderr) {
429425
if (err) {
430426
console.log(stdout);
@@ -443,7 +439,7 @@ function createAutotoolsTarBall() {
443439
var dstfilename = path.join(dir, 'dist', format('libuv-%s-dist.tar.gz', tag));
444440
try {
445441
fs.renameSync(srcfilename, dstfilename);
446-
fs.rmdirSync(builddir, { recursive: true });
442+
fs.rmdirSync(builddir, { recursive: true }); // in future nodejs, this will be called rmSync
447443
} catch (err) {
448444
return pauseRetry(err);
449445
}

0 commit comments

Comments
 (0)