mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

work with published release instead of draft release

Browse source 
add beta/latest tag with `npm publish`
This commit is contained in:
Vanessa Yuen 2017-08-01 16:08:30 -04:00
parent cd1c5103c7
commit 511bd84ece
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
script/publish-to-npm.js
View file

@ -40,6 +40,8 @@ const jsonFields = [
'keywords' 'keywords'
] ]
let npmTag = ''
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
temp.mkdir('electron-npm', (err, dirPath) => { temp.mkdir('electron-npm', (err, dirPath) => {
if (err) { if (err) {
@ -74,19 +76,19 @@ new Promise((resolve, reject) => {
}) })
}) })
.then((releases) => { .then((releases) => {
// download electron.d.ts from draft release // download electron.d.ts from release
const draftRelease = releases.data.find( const release = releases.data.find(
(release) => release.draft && release.tag_name === `v${rootPackageJson.version}` (release) => release.tag_name === `v${rootPackageJson.version}`
// (release) => release.draft && release.tag_name === `test`
) )
if (!draftRelease) { if (!release) {
throw new Error(`cannot find release with tag v${rootPackageJson.version}`) throw new Error(`cannot find release with tag v${rootPackageJson.version}`)
} }
return draftRelease.assets.find((asset) => asset.name === 'electron.d.ts') return release
}) })
.then((tsdAsset) => { .then((release) => {
const tsdAsset = release.assets.find((asset) => asset.name === 'electron.d.ts')
if (!tsdAsset) { if (!tsdAsset) {
throw new Error(`cannot find electron.d.ts from v${rootPackageJson.version} draft release assets`) throw new Error(`cannot find electron.d.ts from v${rootPackageJson.version} release assets`)
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request.get({ request.get({
@ -101,27 +103,27 @@ new Promise((resolve, reject) => {
reject(err) reject(err)
} else { } else {
fs.writeFileSync(path.join(tempDir, 'electron.d.ts'), body) fs.writeFileSync(path.join(tempDir, 'electron.d.ts'), body)
resolve() resolve(release)
} }
}) })
}) })
}) })
.then((release) => {
npmTag = release.prerelease ? 'beta' : 'latest'
})
.then(() => childProcess.execSync('npm pack', { cwd: tempDir })) .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
.then(() => { .then(() => {
// test that the package can install electron prebuilt from /dist // test that the package can install electron prebuilt from github release
const distDir = path.join(__dirname, '..', 'dist')
const tarballPath = path.join(tempDir, `electron-${rootPackageJson.version}.tgz`) const tarballPath = path.join(tempDir, `electron-${rootPackageJson.version}.tgz`)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
childProcess.execSync(`npm install ${tarballPath} --force --silent`, { childProcess.execSync(`npm install ${tarballPath} --force --silent`, {
env: Object.assign({}, process.env, { electron_config_cache: distDir }), env: Object.assign({}, process.env, { electron_config_cache: tempDir }),
cwd: tempDir cwd: tempDir
}) })
const checkVersion = childProcess.exec(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`) const checkVersion = childProcess.execSync(`${path.join(tempDir, 'node_modules', '.bin', 'electron')} -v`)
checkVersion.stdout.on('data', (data) => { assert.strictEqual(checkVersion.toString().trim(), `v${rootPackageJson.version}`)
assert.strictEqual(data.trim(), `v${rootPackageJson.version}`)
resolve(tarballPath) resolve(tarballPath)
}) })
}) })
}) .then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag}`))
.then((tarballPath) => childProcess.execSync(`npm publish ${tarballPath}`))
.catch((err) => console.error(`Error: ${err}`)) .catch((err) => console.error(`Error: ${err}`))

2
script/upload.py
View file

@ -72,6 +72,8 @@ def main():
# Press the publish button. # Press the publish button.
publish_release(github, release['id']) publish_release(github, release['id'])
# TODO: run publish-to-npm script here
# Do not upload other files when passed "-p". # Do not upload other files when passed "-p".
return return