update cache definition

php-opencloud · Sep 24, 2023 · b874645 · b874645
1 parent 790152b
commit b874645
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
@@ -20,12 +20,14 @@ jobs:
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.php_cs.cache
             ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php_version }}
@@ -34,10 +36,12 @@ jobs:
           coverage: none
       - run: composer install --prefer-dist --no-interaction --no-progress
       - name: Restore devstack cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
-          path: /opt/stack/
-          key: ${{ runner.os }}-oscache-${{ matrix.openstack_version }}
+          path: |
+            /opt/stack/
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}}
       - name: Deploy devstack
         uses: EmilienM/devstack-action@v0.11
         with:

diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml
@@ -20,12 +20,14 @@ jobs:
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.php_cs.cache
             ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php_version }}
@@ -34,10 +36,12 @@ jobs:
           coverage: none
       - run: composer install --prefer-dist --no-interaction --no-progress
       - name: Restore devstack cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
-          path: /opt/stack/
-          key: ${{ runner.os }}-oscache-${{ matrix.openstack_version }}
+          path: |
+            /opt/stack/
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-{{env.GITHUB_WORKFLOW}}
       - name: Deploy devstack
         uses: EmilienM/devstack-action@v0.11
         with: