Skip to content

Commit a1f7e96

Browse files
PastaPastaPastaknst
authored andcommitted
Merge dashpay#6406: ci: use actions/cache to manage depends cache
9cc29a8 ci: use `actions/cache` to manage depends cache (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Builds after [dash#6401](dashpay#6401) have silently stopped building Dash Qt, see pre-[dash#6401](dashpay#6401) `develop` (6a51ab2)'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](dashpay#6401 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 dashpay@9cc29a8 UdjinM6: utACK 9cc29a8 Tree-SHA512: 09663987696d29e12c98b48297960c7c1e6484e337ddc8311f340fee1d026ace572674e8cbca578ba743ff781caabb6fcc1853cee8ddff3e13af3fe3d0361776
1 parent 90a3807 commit a1f7e96

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

.github/workflows/build.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,20 @@ jobs:
8686
restore-keys: |
8787
depends-sources-
8888
89-
- name: Cache dependencies
89+
- name: Cache depends
9090
uses: actions/cache@v4
9191
with:
9292
path: |
9393
depends/built
94+
depends/${{ matrix.host }}
9495
key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
9596
restore-keys: |
9697
${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
9798
${{ runner.os }}-depends-${{ matrix.build_target }}
9899
99-
- name: Build dependencies
100+
- name: Build depends
100101
run: make -j$(nproc) -C depends HOST=${{ matrix.host }}
101102

102-
- name: Upload built depends
103-
uses: actions/upload-artifact@v4
104-
with:
105-
name: depends-${{ matrix.build_target }}
106-
path: depends/${{ matrix.host }}
107-
108103
build:
109104
name: Build
110105
needs: [build-image, build-depends]
@@ -146,11 +141,13 @@ jobs:
146141
with:
147142
ref: ${{ github.event.pull_request.head.sha }}
148143

149-
- name: Download built depends
150-
uses: actions/download-artifact@v4
144+
- name: Restore depends cache
145+
uses: actions/cache/restore@v4
151146
with:
152-
name: depends-${{ matrix.depends_on }}
153-
path: depends/${{ matrix.host }}
147+
path: |
148+
depends/built
149+
depends/${{ matrix.host }}
150+
key: ${{ runner.os }}-depends-${{ matrix.depends_on }}-${{ hashFiles('depends/packages/*') }}
154151

155152
- name: Determine PR Base SHA
156153
id: vars

0 commit comments

Comments
 (0)