Update circleci instructions

.circleci/config.yml

@@ -1,84 +1,35 @@
 version: 2
 jobs:
-  build-nixos:
+  build:
     working_directory: ~/repo
+    parallelism: 1
 
     docker:
-    - image: savannidgerinel/nixos-rust
+      - image: circleci/rust:1.39
 
     steps:
       - checkout
 
       - restore_cache:
-          key: rust-nixos-{{ checksum "server/Cargo.lock" }}
-
-      - run:
-          name: update the build channel
-          command: |
-            nix-channel --add https://nixos.org/channels/nixos-19.03 nixpkgs-19.03
-            nix-channel --update
+          keys:
+            - dep-{{ checksum "Cargo.toml" }}
 
       - run:
           name: build
-          command: |
-            nix-build
-
-      - save_cache:
-          key: rust-nixos-{{ checksum "server/Cargo.lock" }}
-          paths:
-            - "/nix/store"
-
-  build-ubuntu:
-    working_directory: ~/repo
-    parallelism: 1
-
-    docker:
-      - image: circleci/rust:1.33-node
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-            - dep-ubuntu-{{ checksum "server/Cargo.toml" }}
+          command: cargo build --release
 
       - run:
-          name: build server
-          command: cd server && cargo build --release
+        name: test fitnesstrax-lib
+        command: |
+          cd fitnesstrax-lib
+          RUST_BACKTRACE=1 cargo test
 
       - run:
-          name: test server
+          name: test the GTK app
           command: |
-            cd server
             mkdir var
             RUST_BACKTRACE=1 cargo test
 
-      - save_cache:
-          key: dep-ubuntu-{{ checksum "server/Cargo.toml" }}
-          paths:
-            - ~/.cargo
-
-      - restore_cache:
-          keys:
-            - dep-{{ checksum "client/package-lock.json" }}
-
-      - run:
-          name: install javascript dependencies
-          command: cd client && npm install
-
-      - run:
-          name: build the client
-          command: cd client && npm run build
-
-      - run:
-          name: test the client
-          command: cd client && npm run test
-
-      - save_cache:
-          key: dep-{{ checksum "client/package-lock.json" }}
-          paths:
-            - client/node_modules
-
       #- run:
           #name: copy components
           #command: |
@@ -95,4 +46,4 @@ workflows:
   version: 2
   build_ubuntu:
     jobs:
-      - build-ubuntu
+      - build