Add forwards-compatible v0.6.5

.github/bors.toml

@@ -1,4 +1,8 @@
 block_labels = ["needs-decision"]
 delete_merged_branches = true
 required_approvals = 1
-status = ["continuous-integration/travis-ci/push"]
+status = [
+    "ci-linux (stable)",
+    "ci-linux (1.38.0)",
+    "clippy",
+]

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+on:
+  push:
+    branches: [ staging, trying, master ]
+  pull_request:
+
+name: CI
+
+jobs:
+  ci-linux:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    strategy:
+      matrix:
+        # All generated code should be running on stable now
+        rust: [stable]
+
+        include:
+          # Test MSRV
+          - rust: 1.38.0
+
+          # Test nightly but don't fail
+          - rust: nightly
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - name: Run tests
+        run: cargo test --all
+
+# FIXME: test on macOS and Windows

.github/workflows/clippy.yml

@@ -0,0 +1,25 @@
+on:
+  push:
+    branches: [ staging, trying, master ]
+  pull_request_target:
+
+name: Clippy check
+jobs:
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        if: github.event_name == 'pull_request_target'
+        with:
+          ref: refs/pull/${{ github.event.number }}/head
+      - uses: actions/checkout@v2
+        if: github.event_name != 'pull_request_target'
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.6.5] - 2021-01-13
+
+### Changed
+
+- This release is forwards-compatible with cortex-m 0.7, and depends on and
+  re-exports many types from that version. Both 0.6.5 and 0.7 may co-exist
+  in a build.
+
 ## [v0.6.4] - 2020-10-26
 
 ### Changed

Cargo.toml

@@ -11,17 +11,17 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.6.4"
+version = "0.6.5-alpha"
 edition = "2018"
-links = "cortex-m"  # prevent multiple versions of this crate to be linked together
 
 [dependencies]
 aligned = "0.3.1"
 bare-metal = { version = "0.2.0", features = ["const-fn"] }
 volatile-register = "0.2.0"
 bitfield = "0.13.2"
+cortex_m_0_7 = { package = "cortex-m", version = "0.7.0" }
 
 [features]
 const-fn = []
-cm7-r0p1 = []
-inline-asm = []
+cm7-r0p1 = ["cortex_m_0_7/cm7-r0p1"]
+inline-asm = ["cortex_m_0_7/inline-asm"]

build.rs

@@ -1,20 +1,7 @@
-use std::path::PathBuf;
-use std::{env, fs};
+use std::env;
 
 fn main() {
     let target = env::var("TARGET").unwrap();
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let name = env::var("CARGO_PKG_NAME").unwrap();
-
-    if target.starts_with("thumb") {
-        fs::copy(
-            format!("bin/{}.a", target),
-            out_dir.join(format!("lib{}.a", name)),
-        ).unwrap();
-
-        println!("cargo:rustc-link-lib=static={}", name);
-        println!("cargo:rustc-link-search={}", out_dir.display());
-    }
 
     if target.starts_with("thumbv6m-") {
         println!("cargo:rustc-cfg=cortex_m");