From 5ff762c9c5f67ce854bb0eb264b9218aec836b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jyri=20H=C3=B6gman?= <jyrihogman@gmail.com>
Date: Thu, 26 Sep 2024 23:30:22 +0300
Subject: [PATCH] Speed up server CI/CD workflow

---
 .github/workflows/workflow_server.yaml | 33 ++------------------------
 server/src/tests/service_tests.rs      |  1 -
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/workflow_server.yaml b/.github/workflows/workflow_server.yaml
index 4e0c224..aab6f93 100644
--- a/.github/workflows/workflow_server.yaml
+++ b/.github/workflows/workflow_server.yaml
@@ -34,19 +34,6 @@ jobs:
         with:
           node-version-file: .nvmrc
 
-      - name: Cache node modules
-        id: cache-npm
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Install dependencies
         run: npm install
         working-directory: ./server-infra
@@ -66,13 +53,11 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: waterheater-calc-cache
 
       - name: Build Worker
         run: |
           pip install cargo-lambda
-          cargo lambda build --package waterheater-calc --release
+          cargo lambda build --package waterheater-calc
 
       - uses: pulumi/actions@v5
       - run: |
@@ -84,6 +69,7 @@ jobs:
           PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
 
   deploy_infra:
+    if: ${{ github.ref_name == 'main' }}
     needs: quality_infra
     name: Deploy Infra
     runs-on: ubuntu-latest
@@ -103,19 +89,6 @@ jobs:
         with:
           node-version-file: .nvmrc
 
-      - name: Cache node modules
-        id: cache-npm
-        uses: actions/cache@v3
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - name: Install dependencies
         run: npm install
         working-directory: ./server-infra
@@ -128,8 +101,6 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: waterheater-calc-cache
 
       - name: Build Worker
         run: |
diff --git a/server/src/tests/service_tests.rs b/server/src/tests/service_tests.rs
index 64d79fa..dbdafc7 100644
--- a/server/src/tests/service_tests.rs
+++ b/server/src/tests/service_tests.rs
@@ -140,7 +140,6 @@ fn test_get_filtered_pricing_excludes_hours_from_next_day_evening() {
         ending_hour,
     );
 
-    println!("{:?}", filtered_pricing);
     assert_eq!(filtered_pricing.len(), 3);
     assert_eq!(filtered_pricing[0].date_time.hour(), 22);
     assert_eq!(