diff --git a/old-workflows/r4se.1-build-env.yml b/.github/workflows/r4se.1-build-env.yml similarity index 100% rename from old-workflows/r4se.1-build-env.yml rename to .github/workflows/r4se.1-build-env.yml diff --git a/Dockerfile.r4se.1-build-env b/Dockerfile.r4se.1-build-env index fa5b383..f9706c6 100644 --- a/Dockerfile.r4se.1-build-env +++ b/Dockerfile.r4se.1-build-env @@ -7,7 +7,7 @@ ENV TARGET_FRIENDLYWRT_CONFIG=rockchip-docker # https://github.com/friendlyarm/Actions-FriendlyWrt/blob/master/.github/workflows/build.yml RUN echo $(nproc) && \ apt update > /dev/null && \ - apt install -y -qq wget git clang-12 llvm-12 > /dev/null && \ + apt install -y -qq wget git clang-13 llvm-13 > /dev/null && \ wget https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh && \ sed -i -e 's/^apt-get -y install openjdk-8-jdk/# apt-get -y install openjdk-8-jdk/g' install.sh && \ sed -i -e 's/^\[ -d fa-toolchain \]/# [ -d fa-toolchain ]/g' install.sh && \ @@ -50,7 +50,7 @@ RUN git clone --depth=1 https://github.com/licsber/Dockerfile.git && \ RUN cd friendlywrt && \ mkdir -p staging_dir/host/llvm-bpf/bin/ && \ - ln -s /usr/bin/clang-12 staging_dir/host/llvm-bpf/bin/clang && \ + ln -s /usr/bin/clang-13 staging_dir/host/llvm-bpf/bin/clang && \ make download -j8 || make -j1 V=s && \ find dl -size -1024c -exec ls -l {} \; && \ find dl -size -1024c -exec rm -f {} \; diff --git a/run-r4se.sh b/run-r4se.1-build-env.sh similarity index 76% rename from run-r4se.sh rename to run-r4se.1-build-env.sh index 7041fd2..50036cb 100755 --- a/run-r4se.sh +++ b/run-r4se.1-build-env.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -sudo docker run --rm -it registry.cn-beijing.aliyuncs.com/licsber/github:r4se +sudo docker run --rm -it registry.cn-beijing.aliyuncs.com/licsber/github:r4se.1-build-env