From 5edb6037fbd3e78a5a186544d6026d0723f9f86b Mon Sep 17 00:00:00 2001 From: Christian Fehmer Date: Fri, 26 Jul 2024 10:46:08 +0200 Subject: [PATCH 1/2] ci: optimize prime-cache checkout (@fehmer) --- .github/workflows/monkey-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 93809d406c67..718c2e286fe9 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -68,7 +68,11 @@ jobs: needs: [pre-ci] if: needs.pre-ci.outputs.should-build-be == 'true' || needs.pre-ci.outputs.should-build-fe == 'true' || needs.pre-ci.outputs.should-build-pkg == 'true' || needs.pre-ci.outputs.assets-json == 'true' steps: - - uses: actions/checkout@v4 + - name: checkout package-lock + uses: actions/checkout@v4 + with: + sparse-checkout: | + package-lock.json - name: Cache node modules id: cache-npm @@ -77,12 +81,16 @@ jobs: cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- ${{ runner.os }}- + - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} + name: Full checkout + uses: actions/checkout@v4 + - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} name: Install dependencies run: npm install --prefer-offline --no-audit @@ -106,7 +114,7 @@ jobs: cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- @@ -150,7 +158,7 @@ jobs: cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- @@ -204,7 +212,7 @@ jobs: cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- @@ -247,7 +255,7 @@ jobs: cache-name: cache-node-modules with: path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- From 59413ff18e4cb074984757ee7213f2da91f4bfe1 Mon Sep 17 00:00:00 2001 From: Miodec Date: Fri, 26 Jul 2024 13:18:29 +0200 Subject: [PATCH 2/2] capital c --- .github/workflows/monkey-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/monkey-ci.yml b/.github/workflows/monkey-ci.yml index 718c2e286fe9..f460e8784f2b 100644 --- a/.github/workflows/monkey-ci.yml +++ b/.github/workflows/monkey-ci.yml @@ -68,7 +68,7 @@ jobs: needs: [pre-ci] if: needs.pre-ci.outputs.should-build-be == 'true' || needs.pre-ci.outputs.should-build-fe == 'true' || needs.pre-ci.outputs.should-build-pkg == 'true' || needs.pre-ci.outputs.assets-json == 'true' steps: - - name: checkout package-lock + - name: Checkout package-lock uses: actions/checkout@v4 with: sparse-checkout: |