Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/lightboard-rc' into prod-lightboard
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins committed Jul 31, 2017
2 parents 9e4eeb9 + 254ef8b commit 572eb96
Show file tree
Hide file tree
Showing 336 changed files with 43,460 additions and 12,294 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ tmp/**
app/po/**/*.pot

app/elements/external-play-bundle.html
dump.rdb
dump.rdb

test-results
11 changes: 9 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ pipeline {
stage('test') {
steps {
sh "gulp validate-challenges"
sh "mkdir -p test-results"
sh "xvfb-run --auto-servernum gulp wct"
junit allowEmptyResults: true, testResults: 'test-results/wct.xml'
cucumber 'test-results/cucumber.json'
// Remove the test folder
sh "rm -rf www"
sh "rm -rf www test-results"
}
}

Expand All @@ -63,10 +66,14 @@ pipeline {
bucket = 'apps-lightboard.kano.me'
deploy('./www', bucket)
archive(bucket)
} else if (env.BRANCH_NAME == "lightboard-rc") {
} else if (env.BRANCH_NAME == "lightboard") {
bucket = 'apps-lightboard-staging.kano.me'
deploy('./www', bucket)
archive(bucket)
} else if (env.BRANCH_NAME == "lightboard-rc") {
bucket = 'apps-lightboard-rc.kano.me'
deploy('./www', bucket)
archive(bucket)
} else if (env.NODE_ENV=="staging") {
bucket = 'make-apps-staging-site.kano.me'
deploy('./www', bucket)
Expand Down
Binary file removed app/assets/audio/onboarding/challenge_complete.wav
Binary file not shown.
Binary file added app/assets/audio/samples/loop_mountain.wav
Binary file not shown.
6 changes: 6 additions & 0 deletions app/assets/icons/white_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/mode/lightboard/body-with-buttons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions app/assets/part/motion-big.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/part/stickers/animals/animal-cow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 572eb96

Please sign in to comment.