Fix cache for github actions

vtm9 · vtm9 · commit 488aebaa8f39 · 2021-09-11T22:12:40.000+03:00
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -38,26 +38,26 @@ jobs:
           otp-version: '24.0.5'
           elixir-version: '1.12.3'
 
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: services/app/deps
-      #     key: v2-${{ runner.os }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-deps-
-
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: services/app/_build
-      #     key: v2-${{ runner.os }}-build-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-
-
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: ~/.mix
-      #     key: v2-${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-mix-
+      - uses: actions/cache@v2
+        with:
+          path: services/app/deps
+          key: v2-${{ runner.os }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
+          restore-keys: |
+            v2-${{ runner.os }}-deps-
+
+      - uses: actions/cache@v2
+        with:
+          path: services/app/_build
+          key: v2-${{ runner.os }}-build-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
+          restore-keys: |
+            v2-${{ runner.os }}-build-
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/.mix
+          key: v2-${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
+          restore-keys: |
+            v2-${{ runner.os }}-mix-
 
       - name: Get deps
         run: mix deps.get
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,12 +6,12 @@ on:
       - master
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     services:
       db:
         image: postgres:10.11
-        ports: ["5432:5432"]
+        ports: ['5432:5432']
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -22,29 +22,29 @@ jobs:
       - uses: actions/checkout@v2
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: "24.0.5"
-          elixir-version: "1.12.3"
+          otp-version: '24.0.5'
+          elixir-version: '1.12.3'
 
       - uses: actions/cache@v2
         with:
           path: services/app/deps
           key: v2-${{ runner.os }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
           restore-keys: |
-            ${{ runner.os }}-deps-
+            v2-${{ runner.os }}-deps-
 
       - uses: actions/cache@v2
         with:
           path: services/app/_build
           key: v2-${{ runner.os }}-build-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
           restore-keys: |
-            ${{ runner.os }}-build-
+            v2-${{ runner.os }}-build-
 
       - uses: actions/cache@v2
         with:
           path: ~/.mix
           key: v2-${{ runner.os }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/services/app/mix.lock')) }}
           restore-keys: |
-            ${{ runner.os }}-mix-
+            v2-${{ runner.os }}-mix-
 
       - name: Get deps
         run: mix deps.get
@@ -93,7 +93,6 @@ jobs:
 
       - run: make test
 
-
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
