From d2248ab41d89309165ec3a16477399213ae474c3 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 4 Nov 2022 10:47:18 +0100 Subject: [PATCH 1/3] c2rust: Use released version --- riotbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riotbuild/Dockerfile b/riotbuild/Dockerfile index bc42ef68..a6a7d03e 100644 --- a/riotbuild/Dockerfile +++ b/riotbuild/Dockerfile @@ -344,7 +344,7 @@ RUN \ RUN \ echo 'Installing C2Rust' >&2 && \ - CARGO_HOME=/opt/rustup/.cargo cargo install --no-track --locked c2rust --git https://github.com/chrysn-pull-requests/c2rust --branch riscv-vector-types && \ + CARGO_HOME=/opt/rustup/.cargo cargo install --no-track --locked c2rust --version 0.17.0 && \ echo 'Cleaning up root-owned crates.io cache' >&2 && \ rm -rf /opt/rustup/.cargo/{git,registry,.package-cache} From f69bdcbb1635a536b8605931c427a97dae0354af Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 3 Feb 2023 11:45:37 +0100 Subject: [PATCH 2/3] Tests: Remove leftover files from other builds --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0879c673..6ee00939 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,6 +132,8 @@ jobs: # Some of the above are executed by root, creating ~/.cargo/git as # that user, blocking downloads of own libraries. rm -rf ~/.cargo + # Something left directories that break things + (cd RIOT && git clean -fxd) make -CRIOT/examples/rust-hello-world BUILDTEST_MAKE_REDIRECT='' buildtest make -CRIOT/examples/rust-gcoap BUILDTEST_MAKE_REDIRECT='' buildtest env: From 1f08d8b6216072149736485d5db3cdfa90dbd3c4 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 21 Feb 2023 07:59:06 +0100 Subject: [PATCH 3/3] DO NOT MERGE: Remove leftover files from other builds --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ee00939..2f044a82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,6 +133,12 @@ jobs: # that user, blocking downloads of own libraries. rm -rf ~/.cargo # Something left directories that break things + # A git clean wouldn't remove repositories + rm -rf RIOT/build + # These files can't be removed? + ls -ld tests/pkg_nanopb/bin/native/core_lib + ls -l tests/pkg_nanopb/bin/native/core_lib/atomic_c11.d + rm -rf tests/pkg_nanopb/bin/native/core_lib (cd RIOT && git clean -fxd) make -CRIOT/examples/rust-hello-world BUILDTEST_MAKE_REDIRECT='' buildtest make -CRIOT/examples/rust-gcoap BUILDTEST_MAKE_REDIRECT='' buildtest