Skip to content

Commit fa35b3c

Browse files
authored
Merge pull request #715 from tlaurion/circle_ci_based_on_debian_bullseye_with_x230-flash_and_reproducibility_troubleshooting_helpers
CIs: pass CircleCI to debian:bullseye docker image
2 parents 2ee51d8 + 040e358 commit fa35b3c

1 file changed

Lines changed: 49 additions & 11 deletions

File tree

.circleci/config.yml

Lines changed: 49 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: osresearch/musl-cross:38e52db
5+
- image: debian:bullseye
66
steps:
7+
- run:
8+
name: Install dependencies
9+
command: |
10+
apt update
11+
apt install -y build-essential zlib1g-dev uuid-dev libdigest-sha-perl libelf-dev bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget gnat cpio ccache pkg-config cmake libusb-1.0-0-dev autoconf texinfo ncurses-dev
712
- checkout
813

14+
- restore_cache:
15+
key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
16+
917
- run:
10-
name: Bootstrap make
18+
name: git reset
1119
command: |
12-
make -j4 bootstrap
20+
git reset --hard "$CIRCLE_SHA1" \
1321
1422
# linuxboot steps need something to pass in the kernel header path
1523
# skipping for now
@@ -40,31 +48,61 @@ jobs:
4048
- run:
4149
name: qemu-coreboot
4250
command: |
43-
./build/make-4.2.1/make \
44-
CROSS=/cross/bin/x86_64-linux-musl- \
45-
--load 2 \
51+
rm -rf build/make-4.2.1/ build/qemu-coreboot/* && make --load 2 \
4652
V=1 \
4753
BOARD=qemu-coreboot \
54+
no_output_timeout: 3h
55+
- run:
56+
name: Output qemu-coreboot hashes
57+
command: |
58+
cat build/qemu-coreboot/hashes.txt \
4859
4960
- store-artifacts:
5061
path: build/qemu-coreboot/coreboot.rom
5162
- store-artifacts:
5263
path: build/qemu-coreboot/hashes.txt
53-
64+
- run:
65+
name: x230-flash
66+
command: |
67+
make --load 2 \
68+
V=1 \
69+
BOARD=x230-flash \
70+
no_output_timeout: 3h
71+
- run:
72+
name: Ouput x230-flash hashes
73+
command: |
74+
cat build/x230-flash/hashes.txt \
5475
- run:
5576
name: x230
5677
command: |
57-
./build/make-4.2.1/make \
58-
CROSS=/cross/bin/x86_64-linux-musl- \
59-
--load 2 \
78+
make --load 2 \
6079
V=1 \
6180
BOARD=x230 \
81+
no_output_timeout: 3h
82+
- run:
83+
name: Ouput x230 hashes
84+
command: |
85+
cat build/x230/hashes.txt \
86+
- run:
87+
name: Archiving build logs to bundle in artifacts
88+
command: |
89+
tar zcvf logs.tar.gz ./build/log/*
6290
91+
- store-artifacts:
92+
path: build/x230-flash/x230-flash.rom
6393
- store-artifacts:
6494
path: build/x230/coreboot.rom
6595
- store-artifacts:
66-
path: build/x230/hashes.txt
96+
path: build/x230/initrd.cpio.xz
97+
- store-artifacts:
98+
path: logs.tar.gz
6799

100+
- save_cache:
101+
key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
102+
paths:
103+
- packages
104+
- crossgcc
105+
- build
68106

69107
workflows:
70108
version: 2

0 commit comments

Comments
 (0)