Skip to content

Commit

Permalink
Updated build and wercker file for new repo structure
Browse files Browse the repository at this point in the history
  • Loading branch information
torkelo committed Feb 5, 2015
1 parent e5fbbe9 commit 102c896
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
docsDir: 'docs/'
};

config.mode = grunt.option('mode') || 'standalone';
config.mode = grunt.option('mode') || 'backend';
config.modeOptions = {
zipSuffix: '',
requirejs: {
3 changes: 1 addition & 2 deletions tasks/build_task.js
Original file line number Diff line number Diff line change
@@ -35,14 +35,13 @@ module.exports = function(grunt) {
});
grunt.config('clean.dest_dir', ['<%= destDir %>']);
grunt.config('copy.backend_bin', {
cwd: '../bin',
cwd: 'bin',
expand: true,
src: ['grafana'],
options: { mode: true},
dest: '<%= tempDir %>'
});
grunt.config('copy.backend_files', {
cwd: '../',
expand: true,
src: ['conf/*', 'vendor/**/*', '!conf/grafana.dev.ini'],
dest: '<%= tempDir %>'
8 changes: 3 additions & 5 deletions wercker.yml
Original file line number Diff line number Diff line change
@@ -24,15 +24,13 @@ build:
code: |
go run build.go test
# frontend
- npm-install:
cwd: grafana/
- npm-install
- grunt:
cwd: grafana/
tasks: release --mode=backend
tasks: release
- script:
name: copy output
code: |-
rsync -rv "$WERCKER_SOURCE_DIR/grafana/dist/" "$WERCKER_OUTPUT_DIR"
rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
deploy:
steps:
- add-to-known_hosts:

0 comments on commit 102c896

Please sign in to comment.