diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c32328..a110cec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,8 @@ jobs: runs-on: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.runs-on }} steps: - - uses: actions/checkout@master - - uses: arduino/setup-arduino-cli@v1.1.1 + - uses: actions/checkout@v3 + - uses: arduino/setup-arduino-cli@v1.1.2 - name: Install platform run: | arduino-cli core update-index @@ -36,7 +36,7 @@ jobs: run: working-directory: braid-triggerbox-rs steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install update apt repos run: sudo apt-get update && sudo apt-get install -y libudev-dev if: matrix.runs-on == 'ubuntu-latest' @@ -60,20 +60,18 @@ jobs: run: working-directory: hardware_v3/braid-triggerbox-firmware-pico steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install update apt repos run: sudo apt-get update && sudo apt-get install -y libudev-dev if: matrix.runs-on == 'ubuntu-latest' - name: Setup Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: stable + run: rustup toolchain install stable --profile minimal --no-self-update - name: Install thumbv6m-none-eabi target run: rustup target install thumbv6m-none-eabi - name: Install flip-link run: cargo install flip-link - name: Install elf2uf2-rs - run: cargo install elf2uf2-rs --locked + run: cargo install --git https://github.com/strawlab/elf2uf2-rs - name: Build ELF run: cargo build --release - name: Make artifacts directory diff --git a/hardware_v3/braid-triggerbox-firmware-pico/.github/workflows/ci_checks.yml b/hardware_v3/braid-triggerbox-firmware-pico/.github/workflows/ci_checks.yml deleted file mode 100644 index b397f4b..0000000 --- a/hardware_v3/braid-triggerbox-firmware-pico/.github/workflows/ci_checks.yml +++ /dev/null @@ -1,66 +0,0 @@ -name: CI Checks - -on: [push, pull_request] - -env: - CARGO_TERM_COLOR: always - -jobs: - building: - name: Building - continue-on-error: ${{ matrix.experimental || false }} - strategy: - matrix: - # All generated code should be running on stable now - rust: [nightly, stable] - include: - # Nightly is only for reference and allowed to fail - - rust: nightly - experimental: true - os: - # Check compilation works on common OSes - # (i.e. no path issues) - - ubuntu-latest - - macOS-latest - - windows-latest - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - - run: cargo install flip-link - - run: rustup target install --toolchain=${{ matrix.rust }} thumbv6m-none-eabi - - run: cargo build --all - - run: cargo build --all --release - linting: - name: Linting - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: clippy - - run: rustup target install thumbv6m-none-eabi - - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --all-features -- -D warnings - formatting: - name: Formatting - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - - run: rustup target install thumbv6m-none-eabi - - run: cargo fmt -- --check