From 526add5ead1134554ef04d1dd37bc6c56b2031c1 Mon Sep 17 00:00:00 2001
From: Kristine Steine <kristine.steine@nav.no>
Date: Mon, 4 Mar 2024 16:51:15 +0100
Subject: [PATCH] Chore/fjern yarn cache action (#1683)

---
 .github/workflows/build.yaml               |  3 +--
 .github/workflows/build_n_deploy_dev.yaml  |  3 +--
 .github/workflows/build_n_deploy_prod.yaml |  3 +--
 .github/yarn-cache/action.yml              | 19 -------------------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 .github/yarn-cache/action.yml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b81fb72a..cd15247e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,9 +20,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '18'
-          cache: npm
+          cache: yarn
           registry-url: "https://npm.pkg.github.com"
-      - uses: ./.github/yarn-cache
       - name: Login to GitHub Container Registry
         uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         with:
diff --git a/.github/workflows/build_n_deploy_dev.yaml b/.github/workflows/build_n_deploy_dev.yaml
index 76e5266c..88c99170 100644
--- a/.github/workflows/build_n_deploy_dev.yaml
+++ b/.github/workflows/build_n_deploy_dev.yaml
@@ -18,9 +18,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '18'
-          cache: npm
+          cache: yarn
           registry-url: "https://npm.pkg.github.com"
-      - uses: ./.github/yarn-cache
       - name: Login to GitHub Container Registry
         uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         with:
diff --git a/.github/workflows/build_n_deploy_prod.yaml b/.github/workflows/build_n_deploy_prod.yaml
index 7ad22e9e..d3f83724 100644
--- a/.github/workflows/build_n_deploy_prod.yaml
+++ b/.github/workflows/build_n_deploy_prod.yaml
@@ -22,9 +22,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: '18'
-          cache: npm
+          cache: yarn
           registry-url: "https://npm.pkg.github.com"
-      - uses: ./.github/yarn-cache
       - name: Login to GitHub Container Registry
         uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         with:
diff --git a/.github/yarn-cache/action.yml b/.github/yarn-cache/action.yml
deleted file mode 100644
index 67ac48ee..00000000
--- a/.github/yarn-cache/action.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Yarn install
-description: "Brukes inline i andre filer for å unngå duplikat"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-      shell: bash
-    - uses: actions/cache@v2
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-tilbake-frontend-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-tilbake-frontend-${{ hashFiles('**/yarn.lock') }}
-          ${{ runner.os }}-tilbake-frontend-
-          ${{ runner.os }}-
\ No newline at end of file