Skip to content

Commit d364517

Browse files
committed
CI: Improve flow when building Linux artifacts
Move Linux artifact-related build commands into the artifact Makefile to improve CI readability and simplify adding new Linux artifacts in the future.
1 parent 32675ae commit d364517

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build-linux-artifacts.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ jobs:
5555
run: |
5656
make build-linux-image
5757
make artifact ENABLE_PREBUILT=0 ENABLE_SYSTEM=1
58-
mkdir -p /tmp/rv32emu-linux-image-prebuilt/linux-image
59-
mv build/linux-image/Image /tmp/rv32emu-linux-image-prebuilt/linux-image
60-
mv build/linux-image/rootfs.cpio /tmp/rv32emu-linux-image-prebuilt/linux-image
61-
mv build/linux-image/simplefs.ko /tmp/rv32emu-linux-image-prebuilt/simplefs.ko
62-
mv build/sha1sum-linux-image /tmp
6358
- name: Create tarball
6459
run: |
6560
cd /tmp

mk/artifact.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,14 @@ else
135135
endif
136136
else
137137
ifeq ($(call has, SYSTEM), 1)
138+
$(Q)(mkdir -p /tmp/rv32emu-linux-image-prebuilt/linux-image)
138139
$(Q)(cd $(BIN_DIR) && $(SHA1SUM) linux-image/Image >> sha1sum-linux-image)
139140
$(Q)(cd $(BIN_DIR) && $(SHA1SUM) linux-image/rootfs.cpio >> sha1sum-linux-image)
140141
$(Q)(cd $(BIN_DIR) && $(SHA1SUM) linux-image/simplefs.ko >> sha1sum-linux-image)
142+
$(Q)(mv $(BIN_DIR)/sha1sum-linux-image /tmp)
143+
$(Q)(mv $(BIN_DIR)/linux-image/Image /tmp/rv32emu-linux-image-prebuilt/linux-image)
144+
$(Q)(mv $(BIN_DIR)/linux-image/rootfs.cpio /tmp/rv32emu-linux-image-prebuilt/linux-image)
145+
$(Q)(mv $(BIN_DIR)/linux-image/simplefs.ko /tmp/rv32emu-linux-image-prebuilt/linux-image)
141146
else
142147
git submodule update --init $(addprefix ./tests/,$(foreach tb,$(TEST_SUITES),$(tb)))
143148
$(Q)for tb in $(TEST_SUITES); do \

0 commit comments

Comments
 (0)