Parcourir la source

Updated build and wercker file for new repo structure

Torkel Ödegaard il y a 11 ans
Parent
commit
102c896046
3 fichiers modifiés avec 5 ajouts et 8 suppressions
  1. 1 1
      Gruntfile.js
  2. 1 2
      tasks/build_task.js
  3. 3 5
      wercker.yml

+ 1 - 1
Gruntfile.js

@@ -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: {

+ 1 - 2
tasks/build_task.js

@@ -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 %>'

+ 3 - 5
wercker.yml

@@ -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: