oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix CI

Browse source
This commit is contained in:
Mikunj 2019-10-23 11:20:11 +11:00
parent 9a3aa2a5bc
commit e5f17d9d21
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -10,7 +10,7 @@ linux:
- yarn install --frozen-lockfile
- export SIGNAL_ENV=production
- yarn generate
- $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
- $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
cache:
paths:
- node_modules/
@ -27,7 +27,7 @@ osx:
- yarn install --frozen-lockfile
- export SIGNAL_ENV=production
- yarn generate
- $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
- $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$CI_COMMIT_REF_SLUG' --publish=never --config.directories.output=release
cache:
paths:
- node_modules/
@ -51,7 +51,7 @@ windows:
- call yarn generate
- call node build\grunt.js
- call yarn prepare-beta-build
- call node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
- call node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
- call node build\grunt.js test-release:win
cache:
paths:

2
package.json
View file

@ -20,7 +20,7 @@
"grunt": "grunt",
"icon-gen": "electron-icon-maker --input=images/icon_1024.png --output=./build",
"generate": "yarn icon-gen && yarn grunt",
"build": "build --config.extraMetadata.environment=$SIGNAL_ENV",
"build": "electron-builder --config.extraMetadata.environment=$SIGNAL_ENV",
"build-release": "export SIGNAL_ENV=production && npm run build -- --config.directories.output=release",
"sign-release": "node ts/updater/generateSignature.js",
"build-module-protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js",

4
prepare_beta_build.js
View file

@ -31,8 +31,8 @@ const PRODUCTION_PRODUCT_NAME = 'Loki Messenger';
const BETA_PRODUCT_NAME = 'Loki Messenger Beta';
const APP_ID_PATH = 'build.appId';
const PRODUCTION_APP_ID = 'org.loki.messenger-desktop';
const BETA_APP_ID = 'org.loki.messenger-desktop-beta';
const PRODUCTION_APP_ID = 'com.loki-project.messenger-desktop';
const BETA_APP_ID = 'com.loki-project.messenger-desktop-beta';
const STARTUP_WM_CLASS_PATH = 'build.linux.desktop.StartupWMClass';
const PRODUCTION_STARTUP_WM_CLASS = 'Loki Messenger';