diff --git a/Jenkinsfile b/Jenkinsfile index 445b8702147022e60ab34c72d11c103523ea1b94..2d58fbd748f2fc0172b6592e50dfae6abffad288 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,8 +32,9 @@ pipeline { steps { script { def baseAssetsPath = "https://assets-dev.reticium.io/" + def assetBundleServer = "https://assets-bundles-dev.reticium.io/" def s3Destination = "s3://assets.reticulum-dev-7f8d39c45878ee2e/hubs" - def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${s3Destination}" + def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer} ${s3Destination}" sh "/usr/bin/script --return -c ${shellString(habCommand)} /dev/null" } diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh index fff4639ce6809374f75b19fcb33118d517b6ea73..ab227773bd68f14b27ee4c88f8af69af154f6dbf 100755 --- a/scripts/hab-build-and-push.sh +++ b/scripts/hab-build-and-push.sh @@ -1,7 +1,8 @@ #!/bin/bash export BASE_ASSETS_PATH=$1 -export TARGET_S3_PATH=$2 +export ASSET_BUNDLE_SERVER=$2 +export TARGET_S3_PATH=$3 # To build + push to S3 run: # hab studio run "bash scripts/hab-build-and-push.sh" @@ -13,6 +14,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pushd "$DIR/.." +mkdir -p .yarn mkdir -p node_modules mkdir -p build @@ -24,7 +26,9 @@ rm /usr/bin/env ln -s "$(hab pkg path core/coreutils)/bin/env" /usr/bin/env hab pkg install -b core/coreutils core/bash core/node core/yarn core/aws-cli -yarn install +yarn install --cache-folder .yarn +ls node_modules +ls node_modules/.bin GENERATE_SMOKE_TESTS=true yarn build --output-path build mkdir build/pages mv build/*.html build/pages