From ee334bd12819cfeda0fc38e22f7a764aa2ac627d Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Thu, 12 Jul 2018 22:43:01 +0000
Subject: [PATCH] List bin files to test
---
Jenkinsfile | 3 ++-
scripts/hab-build-and-push.sh | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 445b87021..2d58fbd74 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 fff4639ce..ab227773b 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
--
GitLab