Skip to content

Fix CicleCI cache usage; add docker proc tools for debugging (flake.nix + docker 0.2.5 upload) #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2025
Merged

Fix CicleCI cache usage; add docker proc tools for debugging (flake.nix + docker 0.2.5 upload) #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de80fda
Bump nix develop based docker image to tlaurion/heads-dev-env:v0.2.5 …
tlaurion May 2, 2025
59ade69
CircleCI: fix prep_env changing x230-hotp-maximized step for building…
tlaurion May 2, 2025
4eb038c
modules/musl-cross-make: use $(MAKE) correctly at configure step (wha…
tlaurion May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ commands:
jobs:
prep_env:
docker:
- image: tlaurion/heads-dev-env:v0.2.4
- image: tlaurion/heads-dev-env:v0.2.5
resource_class: large
working_directory: ~/heads
steps:
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

build_and_persist:
docker:
- image: tlaurion/heads-dev-env:v0.2.4
- image: tlaurion/heads-dev-env:v0.2.5
resource_class: large
working_directory: ~/heads
parameters:
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:

build:
docker:
- image: tlaurion/heads-dev-env:v0.2.4
- image: tlaurion/heads-dev-env:v0.2.5
resource_class: large
working_directory: ~/heads
parameters:
Expand All @@ -171,7 +171,7 @@ jobs:

save_cache:
docker:
- image: tlaurion/heads-dev-env:v0.2.4
- image: tlaurion/heads-dev-env:v0.2.5
resource_class: large
working_directory: ~/heads
steps:
Expand Down Expand Up @@ -219,7 +219,7 @@ workflows:
# This step builds musl-cross-make for x86 architecture, which will be used by subsequent x86 board builds
- build_and_persist:
name: x86-musl-cross-make
target: x230-hotp-maximized
target: t480-hotp-maximized
subcommand: "musl-cross-make"
requires:
- prep_env
Expand Down
4 changes: 3 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
autoconf
automake
bashInteractive
coreutils
coreutils #basic tools like ls, cp, mv, kill)
bc
bison # Generate flashmap descriptor parser
bzip2
Expand Down Expand Up @@ -58,6 +58,8 @@
patch
perl
pkg-config
procps #process tools like free, pidof, pkill, top, vmstat, watch, etc
psmisc #process tools like killall, pstree, etc
python3 # me_cleaner, coreboot
rsync # coreboot
sharutils
Expand Down
2 changes: 1 addition & 1 deletion modules/musl-cross-make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ else
# No need to build i386 for x86 since coreboot uses its own compiler
musl-cross-make_configure := \
echo -e >> Makefile 'musl-target:' ; \
echo -e >> Makefile '\t$$$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ;
echo -e >> Makefile '\t$$(MAKE) TARGET="$(MUSL_ARCH)-linux-musl" install' ;

CROSS_PATH ?= $(pwd)/crossgcc/$(CONFIG_TARGET_ARCH)

Expand Down