Skip to content

Commit 98a33dc

Browse files
committed
Update azure pipelines script for new build system
1 parent e82169a commit 98a33dc

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

azure-pipelines.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ trigger:
1010
- trying
1111
# Build pull requests.
1212
- master
13-
# Build post braches
14-
- post-*
1513

1614
strategy:
1715
matrix:
@@ -64,11 +62,11 @@ steps:
6462
displayName: 'Print Rust Version'
6563
continueOnError: true
6664

67-
- script: rustup component add rust-src
68-
displayName: 'Install Rustup Src Component'
65+
- script: rustup component add rust-src llvm-tools-preview
66+
displayName: 'Install Rustup Components'
6967

70-
- script: cargo install cargo-xbuild bootimage --debug
71-
displayName: 'Install cargo-xbuild and bootimage'
68+
- script: cargo install cargo-xbuild cargo-binutils --debug
69+
displayName: 'Install cargo-xbuild cargo-binutils'
7270

7371
- script: sudo apt update && sudo apt install qemu-system-x86
7472
condition: eq( variables['Agent.OS'], 'Linux' )
@@ -96,20 +94,15 @@ steps:
9694
workingDirectory: example-kernel
9795
displayName: 'Build Example Kernel'
9896

99-
- script: cargo run -- --kernel ../example-kernel/target/x86_64-example-kernel/debug/example-kernel
100-
workingDirectory: builder
97+
- script: cargo xbuild --release
10198
displayName: 'Build Bootloader'
99+
env: { KERNEL: "example-kernel/target/x86_64-example-kernel/debug/example-kernel" }
100+
101+
- script: cargo objcopy -- -I elf64-x86-64 -O binary --binary-architecture=i386:x86-64 target/x86_64-bootloader/release/bootloader target/x86_64-bootloader/release/bootloader.bin
102+
displayName: 'Convert Bootloader ELF to Binary'
102103

103104
- bash: |
104-
qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootimage.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
105+
qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
105106
if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
106107
displayName: 'Test Bootloader'
107108

108-
- script: cargo run -- --kernel ../example-kernel/target/x86_64-example-kernel/debug/example-kernel --features vga_320x200
109-
workingDirectory: builder
110-
displayName: 'Build Bootloader (Feature vga_320x200)'
111-
112-
- bash: |
113-
qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootimage.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
114-
if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
115-
displayName: 'Test Bootloader (Feature vga_320x200)'

0 commit comments

Comments
 (0)