Merge #6406: ci: use actions/cache to manage depends cache

9cc29a832e ci: use `actions/cache` to manage depends cache (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Builds after [dash#6401](https://github.com/dashpay/dash/pull/6401) have silently stopped building Dash Qt, see pre-[dash#6401](https://github.com/dashpay/dash/pull/6401) `develop` (6a51ab27)'s [build](https://github.com/dashpay/dash/actions/runs/11881892222/job/33106960691#step:7:725) compared against [build \#1](https://github.com/PastaPastaPasta/dash/actions/runs/11897504945/job/33152711720#step:7:1432) and [build \#2](https://github.com/kwvg/dash/actions/runs/11898510091/job/33156186503#step:7:1432) from [dash#6401](https://github.com/dashpay/dash/pull/6401)'s review process.

    This pull request aims to correct that regression.

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)**
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK 9cc29a832e
  UdjinM6:
    utACK 9cc29a832e

Tree-SHA512: 09663987696d29e12c98b48297960c7c1e6484e337ddc8311f340fee1d026ace572674e8cbca578ba743ff781caabb6fcc1853cee8ddff3e13af3fe3d0361776
This commit is contained in:
pasta 2024-11-19 15:08:46 -06:00
commit d4c17d95b0
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38

View File

@ -86,25 +86,20 @@ jobs:
restore-keys: | restore-keys: |
depends-sources- depends-sources-
- name: Cache dependencies - name: Cache depends
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: | path: |
depends/built depends/built
depends/${{ matrix.host }}
key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }} key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
restore-keys: | restore-keys: |
${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }} ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
${{ runner.os }}-depends-${{ matrix.build_target }} ${{ runner.os }}-depends-${{ matrix.build_target }}
- name: Build dependencies - name: Build depends
run: make -j$(nproc) -C depends HOST=${{ matrix.host }} run: make -j$(nproc) -C depends HOST=${{ matrix.host }}
- name: Upload built depends
uses: actions/upload-artifact@v4
with:
name: depends-${{ matrix.build_target }}
path: depends/${{ matrix.host }}
build: build:
name: Build name: Build
needs: [build-image, build-depends] needs: [build-image, build-depends]
@ -146,11 +141,13 @@ jobs:
with: with:
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
- name: Download built depends - name: Restore depends cache
uses: actions/download-artifact@v4 uses: actions/cache/restore@v4
with: with:
name: depends-${{ matrix.depends_on }} path: |
path: depends/${{ matrix.host }} depends/built
depends/${{ matrix.host }}
key: ${{ runner.os }}-depends-${{ matrix.depends_on }}-${{ hashFiles('depends/packages/*') }}
- name: Determine PR Base SHA - name: Determine PR Base SHA
id: vars id: vars