Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Commit

Permalink
#1632 - Fixing broken build
Browse files Browse the repository at this point in the history
README - Updating to the actual validateBuildEnvironment script that we now run

install - Turns out I used the syntax for build-extras.gradle instead of gradle.properties and didn't realize it because I still had the environment variables defined.

setUpDesktop - The logic we were using which would use the global variable if already defined otherwise it would set it doesn't work in the case of NVM_NODEJS_ORG_MIRROR if someone is using NVM which also sets this variable. Since NVM is more common than needing to change this location when doing our build I decided to revert that change and just overwrite the variable when we are doing a build.
  • Loading branch information
yaronyg committed Dec 13, 2016
1 parent aaf35e7 commit 3f1da2e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ In terms of operating system we assume you are running on macOS. In theory we ca
run successfully on Linux or Windows but we really don't test there very often
so things are likely to break.

From there you need to install in macOS a fairly large mountain of software. For
now you can see the list [here](https://github.com/thaliproject/Thali_CordovaPlugin/blob/1df36b74ee93f1ece85579857ed90a0e05a0cdd1/thali/install/validateBuildEnvironment.js#L16).
You need to install the listed software at the listed version. Two of the entries
are about Sinopia. Details on that is in the next section.
From there you need to install in macOS a fairly large mountain of software. We
have a script, validateBuildEnvironment.js, that checks for all the required
software. You need to install all that software at the listed version for the
build to work. Two of the entries are about Sinopia. Details on that is in the next section.

### Running your own NPM registry
From time to time we run into bugs in PouchDB and Express-PouchDB that we can't
Expand Down
6 changes: 3 additions & 3 deletions thali/install/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@ function generateGradlePropertiesFile(thaliDepotName, thaliBranchName,
projectDir, 'src', 'android', 'gradle.properties');
var fileContents = util.format(
'btconnectorlib2Version = %s\n' +
'ext.cdvMinSdkVersion = %s\n' +
'ext.cdvBuildToolsVersion = %s\n' +
'ext.cdvCompileSdkVersion = %s\n',
'cdvMinSdkVersion = %s\n' +
'cdvBuildToolsVersion = %s\n' +
'cdvCompileSdkVersion = %s\n',
releaseConf.btconnectorlib2,
releaseConf.androidConfig.minSdkVersion,
releaseConf.androidConfig.buildToolsVersion,
Expand Down
2 changes: 1 addition & 1 deletion thali/install/setUpDesktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ trap 'log_error $LINENO' ERR

# These variables are set since a bug in jxcore
# `jx npm install` and `jx install` have different behaviours
NVM_NODEJS_ORG_MIRROR="${NVM_NODEJS_ORG_MIRROR-https://jxcore.azureedge.net}"
NVM_NODEJS_ORG_MIRROR=https://jxcore.azureedge.net
export NVM_NODEJS_ORG_MIRROR
JX_NPM_JXB="${JX_NPM_JXB-jxb311}"
export JX_NPM_JXB
Expand Down

0 comments on commit 3f1da2e

Please sign in to comment.