fix: libglib-2.0.0.dylib missing

Close #2204

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode9.0
+osx_image: xcode9.1
 language: node_js
 
 matrix:
@@ -24,7 +24,10 @@ cache:
     - /tmp/jest-electron-builder-tests
 
 install:
-  - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.2.0/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.2.0.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
+  - |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.4/git-lfs-darwin-amd64-2.3.4.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull
+    fi
   - curl -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv yarn-* $HOME/.yarn
   - export PATH="$HOME/.yarn/bin:$PATH"
   - yarn

package.json

@@ -31,7 +31,7 @@
     "7zip-bin": "^2.2.7",
     "archiver": "^2.1.0",
     "async-exit-hook": "^2.0.1",
-    "aws-sdk": "^2.140.0",
+    "aws-sdk": "^2.141.0",
     "bluebird-lst": "^1.0.5",
     "chalk": "^2.3.0",
     "chromium-pickle-js": "^0.2.0",

packages/builder-util/src/wine.ts

@@ -14,6 +14,7 @@ const wineExecutable = new Lazy<ToolInfo>(async () => {
     debug("Using system wine is forced")
   }
   else if (process.platform === "darwin") {
+    // assume that on travis latest version is used
     const osVersion = await getMacOsVersion()
     let version: string | null = null
     let checksum: string | null = null
@@ -22,7 +23,7 @@ const wineExecutable = new Lazy<ToolInfo>(async () => {
       // noinspection SpellCheckingInspection
       checksum = "dlEVCf0YKP5IEiOKPNE48Q8NKXbXVdhuaI9hG2oyDEay2c+93PE5qls7XUbIYq4Xi1gRK8fkWeCtzN2oLpVQtg=="
     }
-    else if (semver.gte(osVersion, "10.12.0")) {
+    else if (semver.gte(osVersion, "10.12.0") || process.env.TRAVIS_OS_NAME === "osx") {
       version = "2.0.1-mac-10.12"
       // noinspection SpellCheckingInspection
       checksum = "IvKwDml/Ob0vKfYVxcu92wxUzHu8lTQSjjb8OlCTQ6bdNpVkqw17OM14TPpzGMIgSxfVIrQZhZdCwpkxLyG3mg=="
@@ -37,8 +38,8 @@ const wineExecutable = new Lazy<ToolInfo>(async () => {
           WINEDEBUG: "-all,err+all",
           WINEDLLOVERRIDES: "winemenubuilder.exe=d",
           WINEPREFIX: path.join(wineDir, "wine-home"),
-          DYLD_FALLBACK_LIBRARY_PATH: computeEnv(process.env.DYLD_FALLBACK_LIBRARY_PATH, [path.join(wineDir, "lib")])
-        }
+          DYLD_FALLBACK_LIBRARY_PATH: computeEnv(process.env.DYLD_FALLBACK_LIBRARY_PATH, [path.join(wineDir, "lib")]),
+        },
       }
     }
   }

packages/electron-builder/src/targets/appImage.ts

@@ -1,6 +1,6 @@
 import BluebirdPromise from "bluebird-lst"
 import { Arch, exec, log, debug } from "builder-util"
-import { UUID, BlockMapDataHolder } from "builder-util-runtime"
+import { UUID, BlockMapDataHolder,  } from "builder-util-runtime"
 import { getBinFromGithub } from "builder-util/out/binDownload"
 import { unlinkIfExists, copyOrLinkFile, copyDir, USE_HARD_LINKS } from "builder-util/out/fs"
 import * as ejs from "ejs"
@@ -75,7 +75,7 @@ export default class AppImageTarget extends Target {
     }
 
     //noinspection SpellCheckingInspection
-    const vendorDir = await getBinFromGithub("appimage", "9.0.1", "mcme+7/krXSYb5C+6BpSt9qgajFYpn9dI1rjxzSW3YB5R/KrGYYrpZbVflEMG6pM7k9CL52poiOpGLBDG/jW3Q==")
+    const vendorDir = await getBinFromGithub("appimage", "9.0.2", "9Y6o5svZhJMeiVCuzy8PmKk0aERoX7LdqssBkiV/oglwGFvKdR2UK0jCJv5+cU5ZRwheq04npiRJ71qMBGVLIA==")
 
     if (arch === Arch.x64 || arch === Arch.ia32) {
       await copyDir(path.join(vendorDir, "lib", arch === Arch.x64 ? "x86_64-linux-gnu" : "i386-linux-gnu"), path.join(stageDir, "usr/lib"), {
@@ -106,7 +106,7 @@ export default class AppImageTarget extends Target {
     await exec(path.join(vendorToolDir, "appimagetool"), args, {
       env: {
         ...process.env,
-        PATH: `${vendorToolDir}:${process.env.PATH}`,
+        PATH: `${vendorToolDir}:"/Users/develar/Library/Caches/electron-builder/linux-tools/linux-tools-mac-10.12.3/bin:${process.env.PATH}`,
         // to avoid detection by appimagetool (see extract_arch_from_text about expected arch names)
         ARCH: arch === Arch.ia32 ? "i386" : (arch === Arch.x64 ? "x86_64" : "arm"),
       }

packages/electron-publisher-s3/package.json

@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.4.4",
-    "aws-sdk": "^2.140.0",
+    "aws-sdk": "^2.141.0",
     "mime": "^2.0.3",
     "electron-publish": "~0.0.0-semantic-release",
     "builder-util": "^0.0.0-semantic-release",

packages/electron-updater/src/GenericProvider.ts

@@ -1,7 +1,6 @@
 import { GenericServerOptions, HttpError, HttpExecutor, UpdateInfo, WindowsUpdateInfo } from "builder-util-runtime"
-import * as path from "path"
 import { FileInfo, getChannelFilename, getCustomChannelName, getDefaultChannelName, isUseOldMacProvider, newBaseUrl, newUrlFromBase, Provider } from "./main"
-import { getUpdateFileUrl, parseUpdateInfo } from "./Provider"
+import { createFileInfo, parseUpdateInfo } from "./Provider"
 
 export class GenericProvider extends Provider<UpdateInfo> {
   private readonly baseUrl = newBaseUrl(this.configuration.url)
@@ -37,13 +36,7 @@ export class GenericProvider extends Provider<UpdateInfo> {
       return updateInfo as any
     }
 
-    const updateFileUrl = getUpdateFileUrl(updateInfo)
-    const result: FileInfo = {
-      name: path.posix.basename(updateFileUrl),
-      url: newUrlFromBase(updateFileUrl, this.baseUrl).href,
-      sha512: updateInfo.sha512,
-    }
-
+    const result = createFileInfo(updateInfo, this.baseUrl)
     const packages = (updateInfo as WindowsUpdateInfo).packages
     const packageInfo = packages == null ? null : (packages[process.arch] || packages.ia32)
     if (packageInfo != null) {

packages/electron-updater/src/GitHubProvider.ts

@@ -4,7 +4,7 @@ import * as semver from "semver"
 import { URL } from "url"
 import { AppUpdater } from "./AppUpdater"
 import { FileInfo, getChannelFilename, getDefaultChannelName, isUseOldMacProvider, newBaseUrl, newUrlFromBase, Provider } from "./main"
-import { getUpdateFileUrl, parseUpdateInfo } from "./Provider"
+import { createFileInfo, getUpdateFileUrl, parseUpdateInfo } from "./Provider"
 
 export abstract class BaseGitHubProvider<T extends UpdateInfo> extends Provider<T> {
   // so, we don't need to parse port (because node http doesn't support host as url does)
@@ -111,14 +111,8 @@ export class GitHubProvider extends BaseGitHubProvider<UpdateInfo> {
     }
 
     // space is not supported on GitHub
-    const updateFileUrl = getUpdateFileUrl(updateInfo)
-    const name = updateInfo.githubArtifactName || path.posix.basename(updateFileUrl).replace(/ /g, "-")
-    const result: FileInfo = {
-      name,
-      url: newUrlFromBase(this.getBaseDownloadPath(updateInfo.version, name), this.baseUrl).href,
-      sha512: updateInfo.sha512,
-    }
-
+    const fileName = updateInfo.githubArtifactName || path.posix.basename(getUpdateFileUrl(updateInfo)).replace(/ /g, "-")
+    const result = createFileInfo(updateInfo, this.baseUrl, this.getBaseDownloadPath(updateInfo.version, fileName))
     const packages = (updateInfo as WindowsUpdateInfo).packages
     const packageInfo = packages == null ? null : (packages[process.arch] || packages.ia32)
     if (packageInfo != null) {

packages/electron-updater/src/Provider.ts

@@ -1,8 +1,9 @@
 import { CancellationToken, HttpExecutor, safeStringifyJson, UpdateInfo, WindowsUpdateInfo, asArray } from "builder-util-runtime"
 import { OutgoingHttpHeaders, RequestOptions } from "http"
 import { URL } from "url"
-import { FileInfo, isUseOldMacProvider } from "./main"
+import { FileInfo, isUseOldMacProvider, newUrlFromBase } from "./main"
 import { safeLoad } from "js-yaml"
+import * as path from "path"
 
 export abstract class Provider<T extends UpdateInfo> {
   protected requestHeaders: OutgoingHttpHeaders | null
@@ -78,4 +79,12 @@ export function getUpdateFileUrl(info: UpdateInfo) {
     return result
   }
   return asArray(info.url)[0]
+}
+
+export function createFileInfo(updateInfo: UpdateInfo, baseUrl: URL, updateFileUrl: string = getUpdateFileUrl(updateInfo)): FileInfo {
+  return {
+    name: path.posix.basename(updateFileUrl),
+    url: newUrlFromBase(updateFileUrl, baseUrl).href,
+    sha512: updateInfo.sha512,
+  }
 }

test/src/ExtraBuildTest.ts

@@ -11,6 +11,7 @@ function createBuildResourcesTest(platform: Platform) {
     // only dir - avoid DMG
     targets: platform.createTarget(platform === Platform.MAC ? DIR_TARGET : null),
     config: {
+      publish: null,
       directories: {
         buildResources: "custom",
         output: "customDist",

test/src/helpers/runTests.ts

@@ -152,6 +152,10 @@ async function runTests() {
 
   const testResult = await require("jest-cli").runCLI(jestArgs, [rootDir])
   const exitCode = testResult.results == null || testResult.results.success ? 0 : testResult.globalConfig.testFailureExitCode
+  if (isCi) {
+    process.exit(exitCode)
+  }
+
   await remove(TEST_TMP_DIR)
   process.exitCode = exitCode
   if (testResult.globalConfig.forceExit) {

test/src/linux/linuxPackagerTest.ts

@@ -5,7 +5,7 @@ import { assertThat } from "../helpers/fileAssert"
 import { app, appThrows, modifyPackageJson } from "../helpers/packTester"
 import { ELECTRON_VERSION } from "../helpers/testConfig"
 
-test.ifNotWindows.ifNotCiMac("AppImage", app({
+test.ifNotWindows("AppImage", app({
   targets: Platform.LINUX.createTarget(),
   config: {
     publish: {
@@ -67,7 +67,10 @@ test.ifNotWindows.ifNotCiMac("AppImage - default icon, custom executable and cus
 
 // test prepacked asar also https://github.com/electron-userland/electron-builder/issues/1102
 test.ifNotWindows("icons from ICNS", app({
-  targets: Platform.LINUX.createTarget()
+  targets: Platform.LINUX.createTarget(),
+  config: {
+    publish: null,
+  },
 }, {
   projectDirCreated: it => remove(path.join(it, "build", "icons")),
   packed: async context => {

test/src/windows/appxTest.ts

@@ -7,7 +7,7 @@ import { ensureDir } from "fs-extra-p"
 // test that we can get info from protected pfx
 const protectedCscLink = "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"
 
-const it = process.platform === "darwin" ? test.ifAll : test
+const it = process.platform === "darwin" ? test.ifAll.ifDevOrWinCi : test
 
 it.ifDevOrWinCi("AppX", app({
   targets: Platform.WINDOWS.createTarget(["appx"], Arch.x64),
@@ -20,7 +20,7 @@ it.ifDevOrWinCi("AppX", app({
   signedWin: true,
 }))
 
-it.ifNotCi("certificateSubjectName", app({
+it.ifDevOrWinCi("certificateSubjectName", app({
   targets: Platform.WINDOWS.createTarget(["appx"], Arch.x64),
   config: {
     win: {

test/src/windows/msiTest.ts

@@ -1,7 +1,7 @@
 import { app } from "../helpers/packTester"
 import { Platform } from "electron-builder"
 
-test.ifAll("msi", app({
+test.ifAll.ifDevOrWinCi("msi", app({
   targets: Platform.WINDOWS.createTarget("msi"),
   config: {
     appId: "build.electron.test.msi.oneClick.perMachine",
@@ -14,7 +14,7 @@ test.ifAll("msi", app({
   // signed: true,
 }))
 
-test.ifAll("per-user", app({
+test.ifAll.ifDevOrWinCi("per-user", app({
   targets: Platform.WINDOWS.createTarget("msi"),
   config: {
     appId: "build.electron.test.msi.oneClick.perUser",
@@ -30,7 +30,7 @@ test.ifAll("per-user", app({
   // signed: true,
 }))
 
-test.ifAll("assisted", app({
+test.skip.ifAll("assisted", app({
   targets: Platform.WINDOWS.createTarget("msi"),
   config: {
     appId: "build.electron.test.msi.assisted",

yarn.lock

@@ -439,9 +439,9 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-aws-sdk@^2.140.0:
-  version "2.140.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.140.0.tgz#c15fc5c3db7a1805c59f85767eb1067ae34f9ae4"
+aws-sdk@^2.141.0:
+  version "2.141.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.141.0.tgz#3d96a5970fd9f540ceabcc1d4baeb33b71583aa7"
   dependencies:
     buffer "4.9.1"
     crypto-browserify "1.0.9"