Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
Hubs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ar-noc
Hubs
Commits
634fb514
Commit
634fb514
authored
6 years ago
by
Greg Fodor
Browse files
Options
Downloads
Patches
Plain Diff
Move s3 commands back into build script
parent
fcdff37c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Jenkinsfile
+1
-7
1 addition, 7 deletions
Jenkinsfile
scripts/hab-build-and-push.sh
+3
-0
3 additions, 0 deletions
scripts/hab-build-and-push.sh
with
4 additions
and
7 deletions
Jenkinsfile
+
1
−
7
View file @
634fb514
...
...
@@ -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)}"
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scripts/hab-build-and-push.sh
+
3
−
0
View file @
634fb514
...
...
@@ -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"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment