diff --git a/Jenkinsfile b/Jenkinsfile index 4259b9a523ba6835d5466528c630847f0a24c805..2d58fbd748f2fc0172b6592e50dfae6abffad288 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,15 +34,9 @@ pipeline { def baseAssetsPath = "https://assets-dev.reticium.io/" def assetBundleServer = "https://assets-bundles-dev.reticium.io/" def s3Destination = "s3://assets.reticulum-dev-7f8d39c45878ee2e/hubs" - def s3AssetsDestination = "${s3Destination}/assets" - def s3PagesDestination = "${s3Destination}/pages" - - def habCommand = "sudo /usr/bin/hab-docker-studio -k mozillareality run /bin/bash scripts/hab-build-and-push.sh ${baseAssetsPath} ${assetBundleServer}" + 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" - - sh "aws s3 sync --acl public-read --cache-control max-age=31556926 build/assets ${shellString(s3AssetsDestination)}" - sh "aws s3 sync --acl public-read --cache-control no-cache --delete build/pages ${shellString(s3PagesDestination)}" } } } diff --git a/scripts/hab-build-and-push.sh b/scripts/hab-build-and-push.sh index 672d70a43b9323038f4c31bb2464c2427d90d40c..fd3a4e9a65105bc407b64699dceac0dbae122ee4 100755 --- a/scripts/hab-build-and-push.sh +++ b/scripts/hab-build-and-push.sh @@ -29,3 +29,6 @@ yarn install --cache-folder .yarn GENERATE_SMOKE_TESTS=true yarn build --output-path build mkdir build/pages mv build/*.html build/pages + +aws s3 sync --acl public-read --cache-control "max-age=31556926" build/assets "$TARGET_S3_PATH/assets" +aws s3 sync --acl public-read --cache-control "no-cache" --delete build/pages "$TARGET_S3_PATH/pages"