michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-02' into post-03

Browse Source
This commit is contained in:
Philipp Oppermann
2019-04-26 11:24:17 +02:00
parent f875a933e5 63b97fe1f8
commit 16a314ab8d
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.appveyor.yml
View File

@@ -73,4 +73,5 @@ before_test:
- cargo install-latest cargo-xbuild bootimage
test_script:
- bootimage build
- cargo xbuild
- cargo bootimage

5
.cargo/config Normal file
View File

@@ -0,0 +1,5 @@
[build]
target = "x86_64-blog_os.json"
[target.'cfg(target_os = "none")']
runner = "bootimage runner"

6
.travis.yml
View File

@@ -30,9 +30,9 @@ cache:
before_script:
- rustup component add rust-src llvm-tools-preview
- (test -x $HOME/.cargo/bin/cargo-install-latest || cargo install cargo-install-latest)
- cargo install-latest cargo-xbuild bootimage cargo-cache
- cargo install cargo-xbuild bootimage cargo-cache --debug -Z install-upgrade
script:
- bootimage build
- cargo xbuild
- cargo bootimage
- cargo cache --autoclean

6
Cargo.lock generated
View File

@@ -22,7 +22,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "blog_os"
version = "0.1.0"
dependencies = [
"bootloader 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bootloader 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -30,7 +30,7 @@ dependencies = [
[[package]]
name = "bootloader"
version = "0.5.2"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -241,7 +241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72"
"checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
"checksum bootloader 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2735a1e3ddf16e6832fff86db617778dd3cecd5804fc8c2f20f448750d4c989c"
"checksum bootloader 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8654b1ebbd38d2a8687a451ad53466d01b5edc9d75ec63d676525a6103d77151"
"checksum fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7c6c16d316ccdac21a4dd648e314e76facbbaf316e83ca137d0857a9c07419d0"
"checksum font8x8 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b81d84c3c978af7d05d31a2198af4b9ba956d819d15d8f6d58fc150e33f8dc1f"
"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

2
Cargo.toml
View File

@@ -5,7 +5,7 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
edition = "2018"
[dependencies]
bootloader = "0.5.1"
bootloader = "0.6.0"
volatile = "0.2.3"
spin = "0.4.9"

9
azure-pipelines.yml
View File

@@ -52,14 +52,15 @@ steps:
- script: rustup component add rust-src llvm-tools-preview
displayName: 'Install Rustup Components'
- script: |
cargo install cargo-xbuild --debug
cargo install bootimage --debug
- script: cargo install cargo-xbuild bootimage --debug
displayName: 'Install cargo-xbuild and bootimage'
- script: bootimage build
- script: cargo xbuild
displayName: 'Build'
- script: cargo bootimage
displayName: 'Create Bootimage'
- script: rustup component add rustfmt
displayName: 'Install Rustfmt'