Skip to content

Commit eec22f9

Browse files
authored
Merge pull request #2516 from dpalou/MOBILE-3501
MOBILE-3501 npm: Make keytar lib optional
2 parents 6281ce1 + 7f4c114 commit eec22f9

File tree

4 files changed

+40
-59
lines changed

4 files changed

+40
-59
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ cache:
3232
- $HOME/.gradle/wrapper/
3333
- $HOME/.android/build-cache
3434

35-
before_install:
36-
- if [ "$TRAVIS_OS_NAME" == 'linux' ] ; then sudo apt-get install -y libsecret-1-dev > /dev/null ; fi
37-
3835
before_script:
3936
- if [ "$TRAVIS_OS_NAME" != 'windows' ] ; then npm install npm@latest -g ; fi
4037
- gulp
@@ -67,7 +64,6 @@ jobs:
6764
- node --version
6865
- npm --version
6966
- nvm --version
70-
- sudo apt-get install -y libsecret-1-dev > /dev/null
7167
- npm ci
7268
- npm install -g gulp
7369
script: scripts/aot.sh

gulp/jira.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
const exec = require('child_process').exec;
1616
const https = require('https');
17-
const keytar = require('keytar');
1817
const inquirer = require('inquirer');
1918
const fs = require('fs');
2019
const request = require('request'); // This lib is deprecated, but it was the only way I found to make upload files work.
@@ -246,6 +245,8 @@ class Jira {
246245
this.uri = parsed.path;
247246

248247
// Get the password.
248+
const keytar = require('keytar');
249+
249250
this.password = await keytar.getPassword('mdk-jira-password', this.username); // Use same service name as mdk.
250251

251252
if (!this.password) {

0 commit comments

Comments
 (0)