Update Travis config and fix Codacy

scorelab · May 15, 2020 · 4a9439e · 4a9439e
1 parent 4b112e1
commit 4a9439e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,14 +9,14 @@ services:
 
 script: 
   - docker build --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-ui ui
-  - docker build -f Dockerfile.dev --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-ui ui
-  - docker build -f Dockerfile.prod --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-server components/core
+  - docker build -f ui/Dockerfile.dev --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-ui ui
+  - docker build -f components/core/Dockerfile.prod --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-prod-server components/core
   - docker build --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-dev-server components/core
   - docker build --build-arg VCS_REF=`git rev-parse --short HEAD`   --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` -t scoreucsc/bassa-aria2c components/aria2c
 
 
 after_success:
-  - if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  - if [ "$TRAVIS_BRANCH" == "develop" -a "$TRAVIS_PULL_REQUEST" == "true" ]; then
     docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
     docker push scoreucsc/bassa-prod-ui;
     docker push scoreucsc/bassa-dev-ui;

diff --git a/ui/src/app/completed/services/tableService.js b/ui/src/app/completed/services/tableService.js
@@ -17,9 +17,6 @@
         method: 'POST',
         url: BassaUrl + '/api/compress',
         data: { 'gid': gids },
-        headers: {
-          'token': window.localStorage.getItem("Token")
-        }
       })
     };
     var compressionProgress = function (progressId) {

diff --git a/ui/src/app/signup/controllers/SignupCtrl.js b/ui/src/app/signup/controllers/SignupCtrl.js
@@ -46,6 +46,6 @@
         ToastService.showToast('Please ensure entered details are correct');
       }
     };
-  };
+  }
 
-})();
+})();
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,6 @@ @@
             ToastService.showToast('Please ensure entered details are correct');
           }
         };
-      };
+      }
-    })();
+    })();