diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | hadron-build-beta.diff | 48 |
3 files changed, 3 insertions, 63 deletions
@@ -20,9 +20,7 @@ pkgbase = mongodb-compass-beta optdepends = org.freedesktop.secrets source = mongodb-compass-beta-1.27.0.beta.10-2.tar.gz::https://github.com/mongodb-js/compass/archive/v1.27.0-beta.10.tar.gz source = hadron-build.diff - source = hadron-build-beta.diff sha512sums = d8f312c61c23700235197156bc5f931a8b425a982064e010f09614b7451601655f11ca335b91786b52c0cbc7dce447ddda031b025c441436668d58fd9949d8b7 sha512sums = 9c93c8aa513c9238e04bb860626d09f1e83643cbfd1b8cd66add35cd41e6a7172fedff42f9f9eeedb0e8a3d6b852e1671a8b5a1fa3066d7dd5a543052392946d - sha512sums = 1623ebab6dc95445cd1b512ffa858fc08e2a06cf6d938ef98f14e7bdd639c3df76173fab6e0831e1bd7487b63c99322d294d53d316bc51f5a5da6d3020e9c8a2 pkgname = mongodb-compass-beta @@ -15,11 +15,9 @@ optdepends=('org.freedesktop.secrets') source=( "$pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/mongodb-js/compass/archive/v$_pkgver.tar.gz" 'hadron-build.diff' - 'hadron-build-beta.diff' ) sha512sums=('d8f312c61c23700235197156bc5f931a8b425a982064e010f09614b7451601655f11ca335b91786b52c0cbc7dce447ddda031b025c441436668d58fd9949d8b7' - '9c93c8aa513c9238e04bb860626d09f1e83643cbfd1b8cd66add35cd41e6a7172fedff42f9f9eeedb0e8a3d6b852e1671a8b5a1fa3066d7dd5a543052392946d' - '1623ebab6dc95445cd1b512ffa858fc08e2a06cf6d938ef98f14e7bdd639c3df76173fab6e0831e1bd7487b63c99322d294d53d316bc51f5a5da6d3020e9c8a2') + '9c93c8aa513c9238e04bb860626d09f1e83643cbfd1b8cd66add35cd41e6a7172fedff42f9f9eeedb0e8a3d6b852e1671a8b5a1fa3066d7dd5a543052392946d') _sourcedirectory="compass-$_pkgver" _homedirectory="$pkgname-$pkgver-$pkgrel-home" @@ -37,11 +35,7 @@ prepare() { HOME="$srcdir/$_homedirectory" npm run bootstrap # Apply hadron-build fixes - if [[ "$target" =~ -beta$ ]]; then - patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build-beta.diff" - else - patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build.diff" - fi + patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build.diff" } build() { @@ -52,11 +46,7 @@ build() { # and let electron-packager use it for building # https://github.com/electron/electron-packager/issues/187 - if [[ "$target" =~ -beta$ ]]; then - NODE_ENV='production' HOME="$srcdir/$_homedirectory" npm run release-evergreen "${_target%-beta}" - else - NODE_ENV='production' HOME="$srcdir/$_homedirectory" npm run package-compass "${_target%-beta}" - fi + NODE_ENV='production' HOME="$srcdir/$_homedirectory" npm run package-compass "${_target%-beta}" } package() { diff --git a/hadron-build-beta.diff b/hadron-build-beta.diff deleted file mode 100644 index d28b93761630..000000000000 --- a/hadron-build-beta.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/commands/release.js b/commands/release.js -index 174fd8cc4..cf39a5d4a 100644 ---- a/commands/release.js -+++ b/commands/release.js -@@ -574,9 +574,7 @@ exports.run = (argv, done) => { - task('create module cache', createModuleCache), - task('create packaged styles', createPackagedStyles), - task('remove development files', removeDevelopmentFiles), -- task('create application asar', createApplicationAsar), -- task('create branded installer', createBrandedInstaller), -- task('create application zip', createApplicationZip) -+ task('create application asar', createApplicationAsar) - ]); - - return async.series(tasks, (_err) => { -@@ -590,9 +588,5 @@ exports.run = (argv, done) => { - exports.handler = (argv) => { - exports.run(argv, (_err, CONFIG) => { - cli.abortIfError(_err); -- cli.ok(`${CONFIG.assets.length} assets successfully built`); -- CONFIG.assets.map(function(asset) { -- cli.info(asset.path); -- }); - }); - }; -diff --git a/lib/target.js b/lib/target.js -index 73a0056b7..ade573f8b 100644 ---- a/lib/target.js -+++ b/lib/target.js -@@ -4,8 +4,6 @@ const semver = require('semver'); - const path = require('path'); - const normalizePkg = require('normalize-package-data'); - const parseGitHubRepoURL = require('parse-github-repo-url'); --const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg') -- .default; - const windowsInstallerVersion = require('./windows-installer-version'); - const debug = require('debug')('hadron-build:target'); - -@@ -183,8 +181,7 @@ class Target { - platform: this.platform, - arch: this.arch, - electronVersion: this.electronVersion, -- sign: null, -- afterExtract: [ffmpegAfterExtract] -+ sign: null - }; - - if (this.platform === 'win32') { |