Merge pull request #22 from bcmi-labs/build-fix2

Yet another attempt to fix the build.
This commit is contained in:
Akos Kitta 2019-05-10 11:08:58 +02:00 committed by GitHub
commit 1d6ba97d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -32,6 +32,7 @@ jobs:
- script: yarn - script: yarn
env: env:
GITHUB_TOKEN: $(Personal.GitHub.Token) GITHUB_TOKEN: $(Personal.GitHub.Token)
THEIA_ELECTRON_SKIP_REPLACE_FFMPEG: 1
displayName: Build displayName: Build
- bash: | - bash: |
yarn --cwd ./electron/packager/ yarn --cwd ./electron/packager/
@ -59,7 +60,7 @@ jobs:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
dependsOn: dependsOn:
- Build - Build
condition: and(in(variables['Build.Reason'], 'Manual', 'Schedule'), startsWith(variables['Release.Tag'], 'v')) condition: and(succeeded(), and(in(variables['Build.Reason'], 'Manual', 'Schedule'), startsWith(variables['Release.Tag'], 'v')))
steps: steps:
- task: DownloadBuildArtifacts@0 - task: DownloadBuildArtifacts@0
displayName: Download displayName: Download

View File

@ -5,6 +5,7 @@
const fs = require('fs'); const fs = require('fs');
const join = require('path').join; const join = require('path').join;
const shell = require('shelljs'); const shell = require('shelljs');
shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1';
const utils = require('./utils'); const utils = require('./utils');
const { version, release } = utils.versionInfo(); const { version, release } = utils.versionInfo();