mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 14:27:49 +00:00
Merge branch 'post-04' into post-05
This commit is contained in:
16
Cargo.lock
generated
16
Cargo.lock
generated
@@ -30,7 +30,7 @@ dependencies = [
|
|||||||
"spin",
|
"spin",
|
||||||
"uart_16550",
|
"uart_16550",
|
||||||
"volatile",
|
"volatile",
|
||||||
"x86_64",
|
"x86_64 0.8.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -100,7 +100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b"
|
checksum = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"x86_64",
|
"x86_64 0.7.7",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -127,3 +127,15 @@ dependencies = [
|
|||||||
"cast",
|
"cast",
|
||||||
"ux",
|
"ux",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "x86_64"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a16d71284451a78134cae89ad63d5a0b0cc4b3aa663399f6a9dad74155228c61"
|
||||||
|
dependencies = [
|
||||||
|
"array-init",
|
||||||
|
"bit_field",
|
||||||
|
"bitflags",
|
||||||
|
"cast",
|
||||||
|
]
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ harness = false
|
|||||||
bootloader = "0.8.0"
|
bootloader = "0.8.0"
|
||||||
volatile = "0.2.6"
|
volatile = "0.2.6"
|
||||||
spin = "0.5.2"
|
spin = "0.5.2"
|
||||||
x86_64 = "0.7.5"
|
x86_64 = "0.8.0"
|
||||||
uart_16550 = "0.2.0"
|
uart_16550 = "0.2.0"
|
||||||
|
|
||||||
[dependencies.lazy_static]
|
[dependencies.lazy_static]
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
# Documentation: https://aka.ms/yaml
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
branches:
|
|
||||||
include:
|
|
||||||
- '*'
|
|
||||||
exclude:
|
|
||||||
- 'staging.tmp'
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
linux:
|
|
||||||
image_name: 'ubuntu-16.04'
|
|
||||||
rustup_toolchain: nightly
|
|
||||||
mac:
|
|
||||||
image_name: 'macos-10.13'
|
|
||||||
rustup_toolchain: nightly
|
|
||||||
windows:
|
|
||||||
image_name: 'vs2017-win2016'
|
|
||||||
rustup_toolchain: nightly
|
|
||||||
|
|
||||||
pool:
|
|
||||||
vmImage: $(image_name)
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- bash: |
|
|
||||||
echo "Hello world from $AGENT_NAME running on $AGENT_OS"
|
|
||||||
echo "Reason: $BUILD_REASON"
|
|
||||||
echo "Requested for: $BUILD_REQUESTEDFOR"
|
|
||||||
displayName: 'Build Info'
|
|
||||||
continueOnError: true
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
|
|
||||||
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
|
|
||||||
condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
|
|
||||||
displayName: 'Install Rust (Linux/macOS)'
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
curl -sSf -o rustup-init.exe https://win.rustup.rs
|
|
||||||
rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
|
|
||||||
echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin
|
|
||||||
condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
|
||||||
displayName: 'Install Rust (Windows)'
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
rustc -Vv
|
|
||||||
cargo -V
|
|
||||||
displayName: 'Print Rust Version'
|
|
||||||
continueOnError: true
|
|
||||||
|
|
||||||
- script: rustup component add rust-src llvm-tools-preview
|
|
||||||
displayName: 'Install Rustup Components'
|
|
||||||
|
|
||||||
- script: cargo install cargo-xbuild bootimage --debug
|
|
||||||
displayName: 'Install cargo-xbuild and bootimage'
|
|
||||||
|
|
||||||
- script: cargo xbuild
|
|
||||||
displayName: 'Build'
|
|
||||||
|
|
||||||
- script: cargo bootimage
|
|
||||||
displayName: 'Create Bootimage'
|
|
||||||
|
|
||||||
- script: sudo apt update && sudo apt install qemu-system-x86
|
|
||||||
condition: eq( variables['Agent.OS'], 'Linux' )
|
|
||||||
displayName: 'Install QEMU (Linux)'
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
export HOMEBREW_NO_AUTO_UPDATE=1
|
|
||||||
export HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK=1
|
|
||||||
export HOMEBREW_NO_INSTALL_CLEANUP=1
|
|
||||||
brew install qemu
|
|
||||||
condition: eq( variables['Agent.OS'], 'Darwin' )
|
|
||||||
displayName: 'Install QEMU (macOS)'
|
|
||||||
|
|
||||||
- script: |
|
|
||||||
choco install qemu --limit-output --no-progress
|
|
||||||
echo ##vso[task.setvariable variable=PATH;]%PATH%;C:\Program Files\qemu
|
|
||||||
set PATH=%PATH%;C:\Program Files\qemu
|
|
||||||
qemu-system-x86_64 --version
|
|
||||||
condition: eq( variables['Agent.OS'], 'Windows_NT' )
|
|
||||||
displayName: 'Install QEMU (Windows)'
|
|
||||||
|
|
||||||
- script: cargo xtest
|
|
||||||
displayName: 'Test'
|
|
||||||
|
|
||||||
- script: rustup component add rustfmt
|
|
||||||
displayName: 'Install Rustfmt'
|
|
||||||
|
|
||||||
- script: cargo fmt -- --check
|
|
||||||
displayName: 'Check Formatting'
|
|
||||||
Reference in New Issue
Block a user