Update cache action and fix bug with turbo caching in CI (#37774)

This commit is contained in:
Sam Seay 2023-04-28 16:34:49 +12:00 committed by GitHub
parent a303df0da5
commit 6d02b0a00e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 37 deletions

View File

@ -46,7 +46,7 @@ runs:
tools: phpcs, sirbrillig/phpcs-changed tools: phpcs, sirbrillig/phpcs-changed
- name: Cache Composer Dependencies - name: Cache Composer Dependencies
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
with: with:
path: ~/.cache/composer/files path: ~/.cache/composer/files
key: ${{ runner.os }}-php-${{ inputs.php-version }}-composer-${{ hashFiles('**/composer.lock') }} key: ${{ runner.os }}-php-${{ inputs.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
@ -58,14 +58,27 @@ runs:
pnpm -w install turbo pnpm -w install turbo
pnpm install ${{ steps.parse-input.outputs.INSTALL_FILTERS }} pnpm install ${{ steps.parse-input.outputs.INSTALL_FILTERS }}
- name: Get branch name
id: get_branch
shell: bash
run: |
if [ "${{ github.event_name }}" == "pull_request" ]; then
branch_name=$(echo "${{ github.head_ref }}" | tr '/' '-')
echo "CURRENT_BRANCH_NAME=$branch_name" >> $GITHUB_OUTPUT
else
echo "CURRENT_BRANCH_NAME=${{ github.ref_name }}" >> $GITHUB_OUTPUT
fi
- name: Cache Build Output - name: Cache Build Output
uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
with: with:
path: node_modules/.cache/turbo path: .turbo
key: ${{ runner.os }}-build-output-${{ hashFiles('node_modules/.cache/turbo/*-meta.json') }} key: ${{ runner.os }}-build-output-${{ steps.get_branch.outputs.CURRENT_BRANCH_NAME }}-${{ github.sha }}
restore-keys: ${{ runner.os }}-build-output- restore-keys: |
${{ runner.os }}-build-output-${{ steps.get_branch.outputs.CURRENT_BRANCH_NAME }}
${{ runner.os }}-build-output
- name: Build - name: Build
if: ${{ inputs.build == 'true' }} if: ${{ inputs.build == 'true' }}
shell: bash shell: bash
run: pnpm -w exec turbo run turbo:build ${{ steps.parse-input.outputs.BUILD_FILTERS }} run: pnpm -w exec turbo run turbo:build --cache-dir=".turbo" ${{ steps.parse-input.outputs.BUILD_FILTERS }}

View File

@ -59,7 +59,7 @@
"sass": "^1.59.3", "sass": "^1.59.3",
"sass-loader": "^10.4.1", "sass-loader": "^10.4.1",
"syncpack": "^9.8.4", "syncpack": "^9.8.4",
"turbo": "^1.8.5", "turbo": "^1.9.3",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"url-loader": "^1.1.2", "url-loader": "^1.1.2",
"webpack": "^5.76.2" "webpack": "^5.76.2"

View File

@ -103,8 +103,8 @@ importers:
specifier: ^9.8.4 specifier: ^9.8.4
version: 9.8.4 version: 9.8.4
turbo: turbo:
specifier: ^1.8.5 specifier: ^1.9.3
version: 1.8.5 version: 1.9.3
typescript: typescript:
specifier: ^4.9.5 specifier: ^4.9.5
version: 4.9.5 version: 4.9.5
@ -8689,9 +8689,9 @@ packages:
'@babel/core': 7.21.3 '@babel/core': 7.21.3
'@babel/helper-annotate-as-pure': 7.16.7 '@babel/helper-annotate-as-pure': 7.16.7
'@babel/helper-module-imports': 7.16.7 '@babel/helper-module-imports': 7.16.7
'@babel/helper-plugin-utils': 7.20.2 '@babel/helper-plugin-utils': 7.18.9
'@babel/plugin-syntax-jsx': 7.16.7(@babel/core@7.21.3) '@babel/plugin-syntax-jsx': 7.16.7(@babel/core@7.21.3)
'@babel/types': 7.21.3 '@babel/types': 7.17.0
dev: true dev: true
/@babel/plugin-transform-react-jsx@7.19.0(@babel/core@7.12.9): /@babel/plugin-transform-react-jsx@7.19.0(@babel/core@7.12.9):
@ -8920,8 +8920,8 @@ packages:
dependencies: dependencies:
'@babel/core': 7.21.3 '@babel/core': 7.21.3
'@babel/helper-module-imports': 7.16.0 '@babel/helper-module-imports': 7.16.0
'@babel/helper-plugin-utils': 7.20.2 '@babel/helper-plugin-utils': 7.14.5
babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.21.3) babel-plugin-polyfill-corejs2: 0.3.0(@babel/core@7.21.3)
babel-plugin-polyfill-corejs3: 0.4.0(@babel/core@7.21.3) babel-plugin-polyfill-corejs3: 0.4.0(@babel/core@7.21.3)
babel-plugin-polyfill-regenerator: 0.3.0(@babel/core@7.21.3) babel-plugin-polyfill-regenerator: 0.3.0(@babel/core@7.21.3)
semver: 6.3.0 semver: 6.3.0
@ -20820,8 +20820,8 @@ packages:
peerDependencies: peerDependencies:
postcss: ^8.1.0 postcss: ^8.1.0
dependencies: dependencies:
browserslist: 4.21.4 browserslist: 4.20.2
caniuse-lite: 1.0.30001418 caniuse-lite: 1.0.30001352
fraction.js: 4.2.0 fraction.js: 4.2.0
normalize-range: 0.1.2 normalize-range: 0.1.2
picocolors: 1.0.0 picocolors: 1.0.0
@ -22364,7 +22364,6 @@ packages:
escalade: 3.1.1 escalade: 3.1.1
node-releases: 2.0.6 node-releases: 2.0.6
picocolors: 1.0.0 picocolors: 1.0.0
dev: true
/browserslist@4.20.4: /browserslist@4.20.4:
resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==} resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==}
@ -37915,7 +37914,7 @@ packages:
is-touch-device: 1.0.1 is-touch-device: 1.0.1
lodash: 4.17.21 lodash: 4.17.21
moment: 2.29.4 moment: 2.29.4
object.assign: 4.1.2 object.assign: 4.1.4
object.values: 1.1.5 object.values: 1.1.5
prop-types: 15.8.1 prop-types: 15.8.1
raf: 3.4.1 raf: 3.4.1
@ -41986,65 +41985,65 @@ packages:
/turbo-combine-reducers@1.0.2: /turbo-combine-reducers@1.0.2:
resolution: {integrity: sha512-gHbdMZlA6Ym6Ur5pSH/UWrNQMIM9IqTH6SoL1DbHpqEdQ8i+cFunSmSlFykPt0eGQwZ4d/XTHOl74H0/kFBVWw==} resolution: {integrity: sha512-gHbdMZlA6Ym6Ur5pSH/UWrNQMIM9IqTH6SoL1DbHpqEdQ8i+cFunSmSlFykPt0eGQwZ4d/XTHOl74H0/kFBVWw==}
/turbo-darwin-64@1.8.5: /turbo-darwin-64@1.9.3:
resolution: {integrity: sha512-CAYh56bzeHfnh7jTm03r29bh8p5a/EjQo1Id5yLUH7hS7msTau/+YpxJWPodLbN0UQsUYivUqHQkglJ+eMJ7xA==} resolution: {integrity: sha512-0dFc2cWXl82kRE4Z+QqPHhbEFEpUZho1msHXHWbz5+PqLxn8FY0lEVOHkq5tgKNNEd5KnGyj33gC/bHhpZOk5g==}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-darwin-arm64@1.8.5: /turbo-darwin-arm64@1.9.3:
resolution: {integrity: sha512-R3jCPOv+lu3dcvMhj8b/Defv6dyUwX6W+tbX7d6YUCA46Plf/bGCQ8+MSbxmr/4E1GyGOVFsn1wRfiYk0us/Dg==} resolution: {integrity: sha512-1cYbjqLBA2zYE1nbf/qVnEkrHa4PkJJbLo7hnuMuGM0bPzh4+AnTNe98gELhqI1mkTWBu/XAEeF5u6dgz0jLNA==}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-linux-64@1.8.5: /turbo-linux-64@1.9.3:
resolution: {integrity: sha512-YRc/KNRZeUVvth11UO4SDQZR2IqGgl9MSsbzqoHuFz4B4Q5QXH7onHogv9aXWE/BZBBbcrSBTlwBSG0Gg+J8hg==} resolution: {integrity: sha512-UuBPFefawEwpuxh5pM9Jqq3q4C8M0vYxVYlB3qea/nHQ80pxYq7ZcaLGEpb10SGnr3oMUUs1zZvkXWDNKCJb8Q==}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-linux-arm64@1.8.5: /turbo-linux-arm64@1.9.3:
resolution: {integrity: sha512-8exVZb7XBl/V3gHSweuUyG2D9IzfWqwLvlXoeLWlVYSj61Ajgdv+WU7lvUmx+H2s+sSKqmIFmewA5Lw6YY37sg==} resolution: {integrity: sha512-vUrNGa3hyDtRh9W0MkO+l1dzP8Co2gKnOVmlJQW0hdpOlWlIh22nHNGGlICg+xFa2f9j4PbQlWTsc22c019s8Q==}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-windows-64@1.8.5: /turbo-windows-64@1.9.3:
resolution: {integrity: sha512-fA8PU5ZNoFnQkapG06WiEqfsVQ5wbIPkIqTwUsd/M2Lp+KgxE79SQbuEI+2vQ9SmwM5qoMi515IPjgvXAJXgCw==} resolution: {integrity: sha512-0BZ7YaHs6r+K4ksqWus1GKK3W45DuDqlmfjm/yuUbTEVc8szmMCs12vugU2Zi5GdrdJSYfoKfEJ/PeegSLIQGQ==}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-windows-arm64@1.8.5: /turbo-windows-arm64@1.9.3:
resolution: {integrity: sha512-SW/NvIdhckLsAWjU/iqBbCB0S8kXupKscUK3kEW1DZIr3MYcP/yIuaE/IdPuqcoF3VP0I3TLD4VTYCCKAo3tKA==} resolution: {integrity: sha512-QJUYLSsxdXOsR1TquiOmLdAgtYcQ/RuSRpScGvnZb1hY0oLc7JWU0llkYB81wVtWs469y8H9O0cxbKwCZGR4RQ==}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo@1.8.5: /turbo@1.9.3:
resolution: {integrity: sha512-UBnH2wIFb5g6OQCk8f34Ud15ZXV4xEMmugeDJTU5Ur2LpVRsNEny0isSCYdb3Iu3howoNyyXmtpaxWsAwNYkkg==} resolution: {integrity: sha512-ID7mxmaLUPKG/hVkp+h0VuucB1U99RPCJD9cEuSEOdIPoSIuomcIClEJtKamUsdPLhLCud+BvapBNnhgh58Nzw==}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true
optionalDependencies: optionalDependencies:
turbo-darwin-64: 1.8.5 turbo-darwin-64: 1.9.3
turbo-darwin-arm64: 1.8.5 turbo-darwin-arm64: 1.9.3
turbo-linux-64: 1.8.5 turbo-linux-64: 1.9.3
turbo-linux-arm64: 1.8.5 turbo-linux-arm64: 1.9.3
turbo-windows-64: 1.8.5 turbo-windows-64: 1.9.3
turbo-windows-arm64: 1.8.5 turbo-windows-arm64: 1.9.3
dev: true dev: true
/tweetnacl@0.14.5: /tweetnacl@0.14.5: