[CI] Improve cache

parti-renaissance · Oct 4, 2024 · 7bda79b · 7bda79b
1 parent 9869ad7
commit 7bda79b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -49,9 +49,9 @@ runs:
               CONTAINERS: app
           run: make up-no-deps
 
-        - name: Install composer dependencies
-          shell: bash
-          run: make vendor
+#    - name: Install composer dependencies
+#      shell: bash
+#      run: make vendor
 
         - name: Create private & public key
           if: inputs.keys == 'true'

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -183,8 +183,17 @@ jobs:
                   keys: true
                   cache-warmup: true
 
+      -   name: Cache static assets
+          uses: actions/cache@v4
+          with:
+              key: cache-${{ env.CACHE_KEY }}-static-${{ github.sha }}
+              path: |
+                  public/built/
+                  public/css/
+                  public/select2/
+
             - name: Prepare app (assets, cache, db, rabbitmq)
-              run: make tfp
+        run: make tfp-db
 
             - env:
                   PHPUNIT_ARGS: --log-junit ./phpunit/junit.xml
@@ -214,8 +223,17 @@ jobs:
                   keys: true
                   cache-warmup: true
 
+      -   name: Cache static assets
+          uses: actions/cache@v4
+          with:
+              key: cache-${{ env.CACHE_KEY }}-static-${{ github.sha }}
+              path: |
+                  public/built/
+                  public/css/
+                  public/select2/
+
             - name: Prepare app (assets, cache, db, rabbitmq)
-              run: make tfp
+        run: make tfp-db
 
             - env:
                   BEHAT_ARGS: --suite=default -vvv --colors -f progress -o std -f junit -o ./behat --
@@ -252,8 +270,17 @@ jobs:
                   extra-containers: db redis rabbitmq selenium
                   keys: true
 
+      - name: Cache static assets
+        uses: actions/cache@v4
+        with:
+          key: cache-${{ env.CACHE_KEY }}-static-${{ github.sha }}
+          path: |
+            public/built/
+            public/css/
+            public/select2/
+
             - name: Prepare app (assets, cache, db, rabbitmq)
-              run: make tfp
+        run: make tfp-db
 
             - env:
                   BEHAT_ARGS: --suite=javascript --tags="${{ matrix.tags }}" -vvv --colors -f progress -o std -f junit -o ./behat --
@@ -288,15 +315,6 @@ jobs:
                   path: node_modules/
                   key: cache-${{ env.CACHE_KEY }}-yarn-${{ hashFiles('yarn.lock') }}
 
-            - name: Cache static assets
-              uses: actions/cache@v4
-              with:
-                  path: |
-                      public/built/
-                      public/css/
-                      public/select2/
-                  key: cache-${{ env.CACHE_KEY }}-static-${{ github.sha }}
-
             - name: Setup yarn
               uses: ./.github/actions/setup-yarn