gh actions cache improvements (#3634)

SAP · Feb 2, 2024 · 2cf5164 · 2cf5164
1 parent 63fdb0b
commit 2cf5164
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 60 deletions.
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
@@ -11,7 +11,7 @@ jobs:
   prepare: 
     uses: ./.github/workflows/prepare.yml
     with: 
-      buildcache_key: compat_buildcache
+      buildcache_key: compat_buildcache-${{ github.ref }}
     secrets: inherit
 
   compatibility:
@@ -28,6 +28,6 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: compat_buildcache  
+          key: compat_buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: bash ./scripts/testCompatibility.sh --tag latest
diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
@@ -8,7 +8,7 @@ jobs:
     uses: ./.github/workflows/prepare.yml
     secrets: inherit
     with:
-      buildcache_key: buildcache-container
+      buildcache_key: buildcache-container-${{ github.ref }}
 
   publish:
     runs-on: ubuntu-latest
@@ -24,7 +24,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache-container
+          key: buildcache-container-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_LUI_AUTH_TOKEN" > ~/.npmrc
       - run: ls ./container/public 

diff --git a/.github/workflows/luigi-client-support-ui5-release.yml b/.github/workflows/luigi-client-support-ui5-release.yml
@@ -8,7 +8,7 @@ jobs:
     uses: ./.github/workflows/prepare.yml
     secrets: inherit
     with:
-      buildcache_key: buildcache-luigi-client-support-ui5-release
+      buildcache_key: buildcache-luigi-client-support-ui5-release-${{ github.ref }}
 
   publish:
     runs-on: ubuntu-latest
@@ -24,7 +24,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache-luigi-client-support-ui5-release
+          key: buildcache-luigi-client-support-ui5-release-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_LUI_AUTH_TOKEN" > ~/.npmrc
       - run: ls ./client-frameworks-support/client-support-ui5/dist

diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.cache
-          key: whitesource_cache          
+          key: whitesource_cache-${{ github.ref }}          
       - run: sudo apt-get install build-essential python2 libgconf-2-4 libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
       - run: npm --prefix ./client ci ./client
       - run: npm --prefix ./core ci ./core

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -17,7 +17,7 @@ jobs:
     uses: ./.github/workflows/prepare.yml
     secrets: inherit
     with:
-      buildcache_key: buildcache-nightly
+      buildcache_key: buildcache-nightly-${{ github.ref }}
 
   publish:
     runs-on: ubuntu-latest
@@ -33,7 +33,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache-nightly
+          key: buildcache-nightly-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_LUI_AUTH_TOKEN" > ~/.npmrc
       - run: cd ./scripts && npm ci

diff --git a/.github/workflows/rc-release.yml b/.github/workflows/rc-release.yml
@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/prepare.yml
     secrets: inherit
     with:
-      buildcache_key: buildcache-rc
+      buildcache_key: buildcache-rc-${{ github.ref }}
 
   publish:
     runs-on: ubuntu-latest
@@ -32,7 +32,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache-rc
+          key: buildcache-rc-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_LUI_AUTH_TOKEN" > ~/.npmrc
       - run: cd ./scripts && npm ci

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     uses: ./.github/workflows/prepare.yml
     secrets: inherit
     with:
-      buildcache_key: buildcache
+      buildcache_key: buildcache-${{ github.ref }}
 
   unit:
     name: Unit Tests
@@ -29,7 +29,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache
+          key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: npm test --prefix core || exit 1
 
@@ -47,7 +47,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache
+          key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* . 
       - run: npm i -g cypress
       - run: npm i -g live-server
@@ -67,7 +67,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache
+          key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* . 
       - run: npm test --prefix container || exit 1
 
@@ -86,7 +86,7 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache
+          key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* . 
       - run: bash ./container/run-container-e2e.sh || exit 1
 
@@ -104,22 +104,14 @@ jobs:
           path: |
             ~/tmp_build
             ~/cypress-binary-cache
-          key: buildcache
+          key: buildcache-${{ github.ref }}
       - run: cp -r ~/tmp_build/* .
       - run: sudo apt-get install libgconf-2-4 libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
       - run: npm install --prefix test/e2e-test-application @babel/plugin-proposal-class-properties
       - run: ls test 
       - run: bash ./test/e2e-js.sh || exit 1
       - run: bash ./test/e2e-angular.sh || exit 1
 
-  cleanup: 
-    needs: [e2e, container_unit_tests, container_e2e_tests, mock_engine, unit]
-    uses: ./.github/workflows/cleanup.yml
-    secrets: inherit
-    with:
-      buildcache_key: buildcache
-
-
   docu_check:
     name: Check Documentation
     runs-on: ubuntu-latest