From 074be07d1800de259ecb1ac6d7391d51dd49ac71 Mon Sep 17 00:00:00 2001 From: CDrummond Date: Mon, 13 Jun 2022 13:08:18 +0100 Subject: [PATCH] Rust 2021? --- .github/workflows/build.yml | 11 +---------- Cargo.toml | 2 +- docker/Dockerfile | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fd9056..5b4a245 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,18 +66,9 @@ jobs: - name: Checkout uses: actions/checkout@v1 - - name: Docker setup - run: | - docker run --rm -v $(pwd):/source dlecan/rust-crosscompiler-arm:stable - - - name: Enable 2021 edition - run: | - echo 'cargo-features = ["edition2021"]' > /tmp/bliss-analyser-Cargo.toml - cat Cargo.toml >> /tmp/bliss-analyser-Cargo.toml - mv /tmp/bliss-analyser-Cargo.toml Cargo.toml - - name: Build run: | + docker run --rm -v $(pwd):/source dlecan/rust-crosscompiler-arm:stable docker build -t bliss-analyser-cross - < docker/Dockerfile docker run --rm -v $PWD/target:/build -v $PWD:/src bliss-analyser-cross diff --git a/Cargo.toml b/Cargo.toml index 0eee323..6473687 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "bliss-analyser" version = "0.2.1" authors = ["Craig Drummond "] -edition = "2018" +edition = "2021" license = "GPL-3.0-only" description = "Analyse audio files with bliss-rs" repository = "https://github.com/CDrummond/bliss-analyser" diff --git a/docker/Dockerfile b/docker/Dockerfile index 7f0add3..f45577f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get install -y curl git build-essential gcc-multilib musl-tools musl-dev RUN curl https://sh.rustup.rs -sSf | sh -s -- -y ENV PATH="/root/.cargo/bin/:${PATH}" -RUN rustup default nightly && rustup update RUN rustup target add aarch64-unknown-linux-gnu && \ rustup target add arm-unknown-linux-gnueabihf