From 5c964dc7b9525aa3342a27ac8af63a3494e8a0c1 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 10 Dec 2019 16:45:34 +0100 Subject: [PATCH 1/2] Update to x86_64 0.8.0 --- Cargo.lock | 16 ++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9b0ed7d3..0bda436a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ "spin", "uart_16550", "volatile", - "x86_64", + "x86_64 0.8.0", ] [[package]] @@ -100,7 +100,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "803ea8cb602dbb32c1a657a866d2dd79fe7dbeab0fb2ac667cb4dcc7de12a58b" dependencies = [ "bitflags", - "x86_64", + "x86_64 0.7.7", ] [[package]] @@ -127,3 +127,15 @@ dependencies = [ "cast", "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", +] diff --git a/Cargo.toml b/Cargo.toml index 1a78decf..220ecb35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ harness = false bootloader = "0.8.0" volatile = "0.2.6" spin = "0.5.2" -x86_64 = "0.7.5" +x86_64 = "0.8.0" uart_16550 = "0.2.0" [dependencies.lazy_static] From 1be386ae783f82e6caad32ecbdc886e977cedd79 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 10 Dec 2019 16:48:00 +0100 Subject: [PATCH 2/2] Remove azure pipelines CI script --- azure-pipelines.yml | 74 --------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 078702a5..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,74 +0,0 @@ -# Documentation: https://aka.ms/yaml - -trigger: - branches: - include: - - '*' - exclude: - - 'staging.tmp' - -strategy: - matrix: - linux: - image_name: 'ubuntu-16.04' - rustup_toolchain: stable - mac: - image_name: 'macos-10.13' - rustup_toolchain: stable - windows: - image_name: 'vs2017-win2016' - rustup_toolchain: stable - -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 target add thumbv7em-none-eabihf - displayName: Add thumbv7em-none-eabihf Target - -- script: cargo build --target thumbv7em-none-eabihf - displayName: 'Build for thumbv7em-none-eabihf' - -- script: cargo rustc -- -C link-arg=-nostartfiles - condition: eq( variables['Agent.OS'], 'Linux' ) - displayName: 'Build for Linux' - -- script: cargo rustc -- -C link-args="-e __start -static -nostartfiles" - condition: eq( variables['Agent.OS'], 'Darwin' ) - displayName: 'Build for macOS' - -- script: cargo rustc -- -C link-args="/ENTRY:_start /SUBSYSTEM:console" - condition: eq( variables['Agent.OS'], 'Windows_NT' ) - displayName: 'Build for Windows' - -- script: rustup component add rustfmt - displayName: 'Install Rustfmt' - -- script: cargo fmt -- --check - displayName: 'Check Formatting'