ci: build deps in separate step

johannesloetzsch · Jul 26, 2021 · c97bf25 · c97bf25
1 parent 2a8eeec
commit c97bf25
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,8 +15,16 @@ jobs:
           keys:
             - nix-{{ checksum "flake.lock" }}-{{ checksum "flake.nix" }}
             - nix-{{ checksum "flake.lock" }}  ## the cache will be cleaned on updates
+      ## We build the depedencies in a separate step.
+      ## This is not required, but allows to see the time it took.
       - run:
-          name: Pure reproducible build + unit tests
+          name: Build Node dependencies
+          command: nix build .#frontend.nodeDependencies -o result-node
+      - run:
+          name: Build Maven dependencies
+          command: nix build .#backend.mavenRepository -o result-maven
+      - run:
+          name: Reproducible build + unit tests
           command: nix build -o result-fullstack --show-trace
       - run:
           name: Integration tests

diff --git a/backend/nix/swlkup-backend.nix b/backend/nix/swlkup-backend.nix
@@ -56,4 +56,4 @@ lib.mergeAttrs
     echo $! > .pid
     fg
   '')
-  { jar = swlkup-backend-jar; }
+  { inherit mavenRepository; jar = swlkup-backend-jar; }
diff --git a/backend/src/swlkup/db/seed/example.clj b/backend/src/swlkup/db/seed/example.clj
@@ -37,7 +37,7 @@
    :id "counselling"
    :crux.spec :swlkup.model.offers/offers
    :target :individual
-   :desc "Counselling for individuals"}
+   :desc "Counselling/Coaching for individuals"}
   {:crux.db/id :crisis_intervention
    :id "crisis_intervention"
    :crux.spec :swlkup.model.offers/offers
@@ -69,9 +69,6 @@
    :target :group
    :desc "Workshops"}
 
-  #_{:crux.db/id :coaching
-   :crux.spec :swlkup.model.offers/offers
-     }
   #_{:crux.db/id :translation
    :crux.spec :swlkup.model.offers/offers
      }

diff --git a/frontend/nix/swlkup-frontend.nix b/frontend/nix/swlkup-frontend.nix
@@ -53,4 +53,4 @@ lib.mergeAttrs
     node ${minimalServer}/serve.js ${staticHTML}
     ''
   )
-  { inherit staticHTML; }
+  { inherit staticHTML nodeDependencies; }