diff options
-rw-r--r-- | .github/dependabot.yml | 14 | ||||
-rw-r--r-- | .github/workflows/audit.yaml | 2 | ||||
-rw-r--r-- | .github/workflows/build.yml | 200 | ||||
-rw-r--r-- | .github/workflows/changelog.yml | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | xtask/Cargo.toml | 2 |
7 files changed, 100 insertions, 128 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..c3fda54f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + labels: + - "skip-changelog" + - package-ecosystem: "cargo" + directory: "/" + schedule: + interval: "weekly" + labels: + - "skip-changelog" diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index abf0898b..1d6069d1 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -6,7 +6,7 @@ jobs: audit: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - uses: actions-rs/audit-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8205d63a..5e1467ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,24 +19,14 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - components: rustfmt + uses: actions/checkout@v3 - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs + - name: cargo fmt --check - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all -- --check # Compilation check check: @@ -52,27 +42,24 @@ jobs: - stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Install Rust ${{ matrix.toolchain }} with target (${{ matrix.target }}) - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.toolchain }} - target: ${{ matrix.target }} - override: true + - name: Install Rust ${{ matrix.toolchain }} + run: | + rustup set profile minimal + rustup override set ${{ matrix.toolchain }} + + - name: Configure Rust target (${{ matrix.target }}) + run: rustup target add ${{ matrix.target }} - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: cargo check - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: check - args: --target=${{ matrix.target }} + run: cargo check --target=${{ matrix.target }} # Clippy clippy: @@ -80,26 +67,19 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-gnu - override: true + uses: actions/checkout@v3 - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs + - name: Add Rust component clippy + run: rustup component add clippy + - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: cargo clippy - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: clippy + run: cargo clippy # Verify all examples, checks checkexamples: @@ -110,29 +90,30 @@ jobs: target: - thumbv7m-none-eabi - thumbv6m-none-eabi + - thumbv8m.base-none-eabi + - thumbv8m.main-none-eabi toolchain: - stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Install Rust ${{ matrix.toolchain }} with target (${{ matrix.target }}) - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.toolchain }} - target: ${{ matrix.target }} - override: true - components: llvm-tools-preview + - name: Install Rust ${{ matrix.toolchain }} + run: | + rustup set profile minimal + rustup override set ${{ matrix.toolchain }} + + - name: Configure Rust target (${{ matrix.target }}) + run: rustup target add ${{ matrix.target }} + + - name: Add Rust component llvm-tools-preview + run: rustup component add llvm-tools-preview - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Check the examples - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: check - args: --examples --target=${{ matrix.target }} + run: cargo check --examples --target=${{ matrix.target }} # Verify the example output with run-pass tests testexamples: @@ -147,25 +128,25 @@ jobs: - stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Install Rust ${{ matrix.toolchain }} with target (${{ matrix.target }}) - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.toolchain }} - target: ${{ matrix.target }} - override: true - components: llvm-tools-preview + - name: Install Rust ${{ matrix.toolchain }} + run: | + rustup set profile minimal + rustup override set ${{ matrix.toolchain }} + + - name: Configure Rust target (${{ matrix.target }}) + run: rustup target add ${{ matrix.target }} + + - name: Add Rust component llvm-tools-preview + run: rustup component add llvm-tools-preview # Use precompiled binutils - name: cargo install cargo-binutils - uses: actions-rs/install@v0.1 - with: - crate: cargo-binutils - version: latest + run: cargo install cargo-binutils - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Install QEMU run: | @@ -176,8 +157,7 @@ jobs: run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs - name: Run-pass tests - run: - cargo xtask --target ${{ matrix.target }} + run: cargo xtask --target ${{ matrix.target }} # Check the correctness of macros/ crate checkmacros: @@ -191,27 +171,24 @@ jobs: - stable steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Install Rust ${{ matrix.toolchain }} with target (${{ matrix.target }}) - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.toolchain }} - target: ${{ matrix.target }} - override: true + - name: Install Rust ${{ matrix.toolchain }} + run: | + rustup set profile minimal + rustup override set ${{ matrix.toolchain }} + + - name: Configure Rust target (${{ matrix.target }}) + run: rustup target add ${{ matrix.target }} - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs - name: cargo check - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: check - args: --manifest-path macros/Cargo.toml --target=${{ matrix.target }} + run: cargo check --manifest-path macros/Cargo.toml --target=${{ matrix.target }} # Run the macros test-suite testmacros: @@ -219,27 +196,16 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-gnu - override: true + uses: actions/checkout@v3 - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs - name: cargo check - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: test - args: --manifest-path macros/Cargo.toml + run: cargo test --manifest-path macros/Cargo.toml # Run test suite tests: @@ -247,26 +213,16 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 - - - name: Install Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-unknown-linux-gnu - override: true + uses: actions/checkout@v3 - name: Cache Dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Fail on warnings run: sed -i 's,//deny_warnings_placeholder_for_ci,#![deny(warnings)],' src/lib.rs macros/src/lib.rs - - uses: actions-rs/cargo@v1 - with: - use-cross: false - command: test - args: --test tests + - name: Run cargo test + run: cargo test --test tests # Build documentation, check links docs: @@ -274,10 +230,10 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Cache pip installed linkchecker - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/pip key: ${{ runner.os }}-pip @@ -285,12 +241,10 @@ jobs: ${{ runner.os }}-pip- - name: Set up Python 3.x - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: # Semantic version range syntax or exact version of a Python version python-version: '3.x' - # Optional - x64 or x86 architecture, defaults to x64 - architecture: 'x64' # You can test your matrix by printing the current Python version - name: Display Python version @@ -321,14 +275,12 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python 3.x - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: # Semantic version range syntax or exact version of a Python version python-version: '3.x' - # Optional - x64 or x86 architecture, defaults to x64 - architecture: 'x64' # You can test your matrix by printing the current Python version - name: Display Python version @@ -383,7 +335,7 @@ jobs: # Only run this when pushing to master branch if: github.ref == 'refs/heads/master' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get crate version and print output branch release/vX id: crateversionbranch @@ -395,7 +347,7 @@ jobs: echo "versionmajor=$VERSIONMAJOR" >> $GITHUB_ENV echo "version=$VERSION" >> $GITHUB_ENV - - uses: everlytic/branch-merge@1.1.2 + - uses: everlytic/branch-merge@1.1.5 with: github_token: ${{ github.token }} source_ref: 'master' @@ -415,15 +367,13 @@ jobs: # Only run this when pushing to master branch if: github.ref == 'refs/heads/master' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.x - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: # Semantic version range syntax or exact version of a Python version python-version: '3.x' - # Optional - x64 or x86 architecture, defaults to x64 - architecture: 'x64' # You can test your matrix by printing the current Python version - name: Display Python version @@ -475,6 +425,8 @@ jobs: # Redirect rtic.rs/meeting/index.html to hackmd mkdir $td/meeting sed "s|URL|https://hackmd.io/c_mFUZL-Q2C6614MlrrxOg|g" redirect.html > $td/meeting/index.html + sed -i "s|Page Redirection|RTIC Meeting|" $td/meeting/index.html + sed -i "s|If you|Redirecting to RTIC HackMD. If you|" $td/meeting/index.html # Redirect the main site to the stable release sed "s|URL|$stable|g" redirect.html > $td/index.html diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index ccf6eb91..74b821da 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Check that changelog updated uses: dangoslen/changelog-enforcer@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1a9f3d..78a72538 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,14 +9,20 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top! ### Added +- CI: Check examples also for thumbv8.{base,main} - Allow custom `link_section` attributes for late resources ### Fixed +- Use native GHA rustup and cargo - Distinguish between thumbv8m.base and thumbv8m.main for basepri usage. ### Changed +- CI: Updated to setup-python@v4 +- CI: Updated to checkout@v3 +- Tuned redirect message for rtic.rs/meeting + ## [v1.1.3] - 2022-06-23 ### Added @@ -37,7 +37,7 @@ systick-monotonic = "1.0.0" [dev-dependencies.panic-semihosting] features = ["exit"] -version = "0.5.2" +version = "0.6.0" [target.x86_64-unknown-linux-gnu.dev-dependencies] trybuild = "1" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 33e6b3ad..f1c468ed 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -5,5 +5,5 @@ edition = "2018" [dependencies] anyhow = "1.0.43" -os_pipe = "0.9.2" +os_pipe = "1.1.2" structopt = "0.3.22" |