Skip to content

Commit 7b38fe3

Browse files
committed
circleci: use separate workspaces per arch to avoid conflicts
- x86-prep and ppc64-prep now persist to separate workspaces - build_and_persist and build jobs accept workspace parameter - ppc64 jobs explicitly set workspace: ppc64 - save_cache_x86/ppc64 attach correct workspace
1 parent 7d579be commit 7b38fe3

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

.circleci/config.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
- nix-docker-heads-coreboot-musl-cross-make-x86-{{ checksum "./tmpDir/coreboot_musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
126126
- nix-docker-heads-musl-cross-make-x86-{{ checksum "./tmpDir/musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
127127
- persist_to_workspace:
128+
workspace: x86
128129
root: ~/heads
129130
paths:
130131
- packages/x86
@@ -148,6 +149,7 @@ jobs:
148149
- nix-docker-heads-coreboot-musl-cross-make-ppc64-{{ checksum "./tmpDir/coreboot_musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
149150
- nix-docker-heads-musl-cross-make-ppc64-{{ checksum "./tmpDir/musl-cross-make.sha256sums" }}{{ .Environment.CACHE_VERSION }}
150151
- persist_to_workspace:
152+
workspace: ppc64
151153
root: ~/heads
152154
paths:
153155
- packages/ppc64
@@ -165,18 +167,23 @@ jobs:
165167
arch:
166168
type: string
167169
default: x86
170+
workspace:
171+
type: string
172+
default: x86
168173
target:
169174
type: string
170175
subcommand:
171176
type: string
172177
steps:
173178
- attach_workspace:
174179
at: ~/heads
180+
workspace: << parameters.workspace >>
175181
- build_board:
176182
arch: << parameters.arch >>
177183
target: << parameters.target >>
178184
subcommand: << parameters.subcommand >>
179185
- persist_to_workspace:
186+
workspace: << parameters.workspace >>
180187
root: ~/heads
181188
paths:
182189
- packages/<< parameters.arch >>
@@ -194,13 +201,17 @@ jobs:
194201
arch:
195202
type: string
196203
default: x86
204+
workspace:
205+
type: string
206+
default: x86
197207
target:
198208
type: string
199209
subcommand:
200210
type: string
201211
steps:
202212
- attach_workspace:
203213
at: ~/heads
214+
workspace: << parameters.workspace >>
204215
- build_board:
205216
arch: <<parameters.arch>>
206217
target: <<parameters.target>>
@@ -215,6 +226,7 @@ jobs:
215226
steps:
216227
- attach_workspace:
217228
at: ~/heads
229+
workspace: x86
218230
- save_cache:
219231
# Generate cache for the same musl-cross-make module definition if hash is not previously existing
220232
# CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
@@ -259,6 +271,7 @@ jobs:
259271
steps:
260272
- attach_workspace:
261273
at: ~/heads
274+
workspace: ppc64
262275
- save_cache:
263276
# Generate cache for the same musl-cross-make module definition if hash is not previously existing
264277
# CircleCI removed their wildcard support, so we have to list precise versions to cache in directory names
@@ -310,6 +323,7 @@ workflows:
310323
- build_and_persist:
311324
name: ppc64-musl-cross-make
312325
arch: ppc64
326+
workspace: ppc64
313327
target: UNTESTED_talos-2
314328
subcommand: "musl-cross-make"
315329
requires:
@@ -346,6 +360,7 @@ workflows:
346360
- build_and_persist:
347361
name: UNTESTED_talos-2
348362
arch: ppc64
363+
workspace: ppc64
349364
target: UNTESTED_talos-2
350365
subcommand: ""
351366
requires:

0 commit comments

Comments
 (0)