Update GHA for integrated cortex-m-rt

8 files changed, 3 insertions, 141 deletions

diff --git a/cortex-m-rt/.github/CODEOWNERS b/cortex-m-rt/.github/CODEOWNERS
deleted file mode 100644
index 21baf47..0000000
--- a/cortex-m-rt/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @rust-embedded/cortex-m
diff --git a/cortex-m-rt/.github/bors.toml b/cortex-m-rt/.github/bors.toml
deleted file mode 100644
index 9b9d884..0000000
--- a/cortex-m-rt/.github/bors.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-block_labels = ["needs-decision"]
-delete_merged_branches = true
-required_approvals = 1
-status = [
-  "ci-linux (stable)",
-  "ci-linux (1.39.0)",
-  "build-other (macOS-latest)",
-  "build-other (windows-latest)",
-  "Rustfmt"
-]
diff --git a/cortex-m-rt/.github/workflows/ci.yml b/cortex-m-rt/.github/workflows/ci.yml
deleted file mode 100644
index 2ddf970..0000000
--- a/cortex-m-rt/.github/workflows/ci.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
-
-name: Continuous integration
-
-jobs:
-  ci-linux:
-    runs-on: ubuntu-20.04
-    continue-on-error: ${{ matrix.experimental || false }}
-    strategy:
-      matrix:
-        # All generated code should be running on stable now
-        rust: [nightly, stable, 1.39.0]
-
-        include:
-          # Nightly is only for reference and allowed to fail
-          - rust: nightly
-            experimental: true
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-      - name: Install all Rust targets for ${{ matrix.rust }}
-        run: rustup target install --toolchain=${{ matrix.rust }} thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.base-none-eabi thumbv8m.main-none-eabi thumbv8m.main-none-eabihf
-      - name: Install qemu and gcc
-        run: sudo apt-get update && sudo apt-get install qemu-system-arm gcc-arm-none-eabi
-      - name: Run CI script for x86_64-unknown-linux-gnu under ${{ matrix.rust }}
-        run: TARGET=x86_64-unknown-linux-gnu TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv6m-none-eabi under ${{ matrix.rust }}
-        run: TARGET=thumbv6m-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv7m-none-eabi under ${{ matrix.rust }}
-        run: TARGET=thumbv7m-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv7em-none-eabi under ${{ matrix.rust }}
-        run: TARGET=thumbv7em-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv7em-none-eabihf under ${{ matrix.rust }}
-        run: TARGET=thumbv7em-none-eabihf TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv8m.base-none-eabi under ${{ matrix.rust }}
-        run: TARGET=thumbv8m.base-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv8m.main-none-eabi under ${{ matrix.rust }}
-        run: TARGET=thumbv8m.main-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-      - name: Run CI script for thumbv8m.main-none-eabihf under ${{ matrix.rust }}
-        run: TARGET=thumbv8m.main-none-eabihf TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
-
-  # On macOS and Windows, we at least make sure that all examples build and link.
-  build-other:
-    strategy:
-      matrix:
-        os:
-          - macOS-latest
-          - windows-latest
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Install all Rust targets
-        run: rustup target install thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.base-none-eabi thumbv8m.main-none-eabi thumbv8m.main-none-eabihf
-      - name: Build examples for thumbv6m-none-eabi
-        run: cargo build --target=thumbv6m-none-eabi --examples
-      - name: Build examples for thumbv7m-none-eabi
-        run: cargo build --target=thumbv7m-none-eabi --examples
-      - name: Build examples for thumbv7em-none-eabi
-        run: cargo build --target=thumbv7em-none-eabi --examples
-      - name: Build examples for thumbv7em-none-eabihf
-        run: cargo build --target=thumbv7em-none-eabihf --examples
-      - name: Build examples for thumbv8m.base-none-eabi
-        run: cargo build --target=thumbv8m.base-none-eabi --examples
-      - name: Build examples for thumbv8m.main-none-eabi
-        run: cargo build --target=thumbv8m.main-none-eabi --examples
-      - name: Build examples for thumbv8m.main-none-eabihf
-        run: cargo build --target=thumbv8m.main-none-eabihf --examples
-      - name: Build crate for host OS
-        run: cargo build
diff --git a/cortex-m-rt/.github/workflows/clippy.yml b/cortex-m-rt/.github/workflows/clippy.yml
deleted file mode 100644
index adc3a6e..0000000
--- a/cortex-m-rt/.github/workflows/clippy.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
-
-name: Clippy check
-jobs:
-  clippy_check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - 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 }}
diff --git a/cortex-m-rt/.github/workflows/rustfmt.yml b/cortex-m-rt/.github/workflows/rustfmt.yml
deleted file mode 100644
index 9a55c00..0000000
--- a/cortex-m-rt/.github/workflows/rustfmt.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
-
-name: Code formatting check
-
-jobs:
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
index 7250384..8e4de1f 100644
--- a/cortex-m-rt/Cargo.toml
+++ b/cortex-m-rt/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rt"
 readme = "README.md"
-repository = "https://github.com/rust-embedded/cortex-m-rt"
+repository = "https://github.com/rust-embedded/cortex-m"
 version = "0.7.1"
 autoexamples = true
 links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
@@ -22,7 +22,7 @@ cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
 # avoid pulling in multiple versions of `cortex-m`.
 
 [dev-dependencies]
-cortex-m = "0.7.1"
+cortex-m = { version = "0.7.4", path = ".." }
 panic-halt = "0.2.0"
 cortex-m-semihosting = "0.3"
 
diff --git a/cortex-m-rt/macros/Cargo.toml b/cortex-m-rt/macros/Cargo.toml
index fc13dac..c73ebc1 100644
--- a/cortex-m-rt/macros/Cargo.toml
+++ b/cortex-m-rt/macros/Cargo.toml
@@ -6,7 +6,7 @@ documentation = "https://docs.rs/cortex-m-rt"
 keywords = ["arm", "cortex-m", "runtime", "startup"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rt-macros"
-repository = "https://github.com/rust-embedded/cortex-m-rt"
+repository = "https://github.com/rust-embedded/cortex-m"
 version = "0.7.0"
 edition = "2018"
 
diff --git a/cortex-m-rt/triagebot.toml b/cortex-m-rt/triagebot.toml
deleted file mode 100644
index fa0824a..0000000
--- a/cortex-m-rt/triagebot.toml
+++ /dev/null
@@ -1 +0,0 @@
-[assign]