Skip to content

Commit

Permalink
fix: Builds fail on building .deb using packaged fpm on Travis
Browse files Browse the repository at this point in the history
FPM updated to 1.8.1, maybe it will help

Close #1402
  • Loading branch information
develar committed Mar 24, 2017
1 parent 2e59959 commit 037fba6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .idea/dictionaries/develar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/electron-builder/src/targets/fpm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ const fpmPath = (process.platform === "win32" || process.env.USE_SYSTEM_FPM ===

// can be called in parallel, all calls for the same version will get the same promise - will be downloaded only once
function downloadFpm(): Promise<string> {
const version = process.platform === "darwin" ? "fpm-1.6.3-20150715-2.2.2" : "fpm-1.6.3-2.3.1"
const version = process.platform === "darwin" ? "fpm-1.8.1-20150715-2.2.2" : "fpm-1.8.1-2.3.1"
const osAndArch = process.platform === "darwin" ? "mac" : `linux-x86${process.arch === "ia32" ? "" : "_64"}`
//noinspection SpellCheckingInspection
const sha2 = process.platform === "darwin" ? "1b13080ecfd2b6fddb984ed6e1dfcb38cdf5b051a04d609c2a95227ed9a5ecbc" :
(process.arch === "ia32" ? "b55f25749a27097140171f073466c52e59f733a275fea99e2334c540627ffc62" : "4c6fc529e996f7ff850da2d0bb6c85080e43be672494b14c0c6bdcc03bf57328")
const sha2 = process.platform === "darwin" ? "97352e184a1f54e5ed0d12f38ac383edebbe421db5a3fb59898e8c9a1c407ed7" :
(process.arch === "ia32" ? "8380331f7d9762a36d7c7181501c3fc9342745b8499b962f6ea37c7dc3778f99" : "6538fcd2486c2831949562abfd0017b67eff502addad5b444baec4899b0babc6")

return getBin("fpm", version, `https://dl.bintray.com/electron-userland/bin/${version}-${osAndArch}.7z`, sha2)
.then(it => path.join(it, "fpm"))
Expand Down
14 changes: 13 additions & 1 deletion packages/npm-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,16 @@ set -e

ln -f README.md packages/electron-builder/README.md

node packages/process.js
npm publish packages/electron-builder-http || true
npm publish packages/electron-builder-core || true
npm publish packages/electron-builder-util || true
npm publish packages/electron-publish || true
npm publish packages/electron-publisher-s3 || true
npm publish packages/electron-builder || true
npm publish packages/electron-builder-squirrel-windows || true
npm publish packages/electron-updater || true

npm publish packages/electron-forge-maker-appimage || true
npm publish packages/electron-forge-maker-snap || true
npm publish packages/electron-forge-maker-nsis || true
npm publish packages/electron-forge-maker-nsis-web || true
17 changes: 0 additions & 17 deletions packages/publish.js

This file was deleted.

0 comments on commit 037fba6

Please sign in to comment.