diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 3b99b0a..aaa238d 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -23,7 +23,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | sudo sysctl vm.swappiness=0 - sudo rm -rf /usr/share/dotnet & #/usr/local/lib/android/sdk + sudo rm -rf /usr/share/dotnet #/usr/local/lib/android/sdk sudo -E apt update sudo -E apt -y --no-upgrade --no-install-recommends install jq zstd secure-delete build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python python3 python-pip python3-pip python-ply python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool rsync swig & @@ -42,7 +42,7 @@ jobs: sudo losetup -P --direct-io $LOOP_DEVICE lede.img mkdir lede && sudo mount $LOOP_DEVICE lede && sudo chown -R $USER:$USER lede [ ! -e lede/.git ] && (cd lede && git init && git remote add -t openwrt-18.06-k5.4 -f origin https://github.com/immortalwrt/immortalwrt && git checkout openwrt-18.06-k5.4) - cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && git pull --ff-only -X theirs + cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" && git pull --ff -X theirs - name: Update feeds and packages run: | diff --git a/r1s.config.seed b/r1s.config.seed index 7a4cc3c..f19252b 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -38,6 +38,7 @@ CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_pv=y CONFIG_PACKAGE_bash=y CONFIG_PACKAGE_curl=y +CONFIG_PACKAGE_coremark=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_nano=y diff --git a/r2s.config.seed b/r2s.config.seed index 6064d75..0a1f6c4 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -38,6 +38,7 @@ CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_pv=y CONFIG_PACKAGE_bash=y CONFIG_PACKAGE_curl=y +CONFIG_PACKAGE_coremark=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_nano=y diff --git a/r4s.config.seed b/r4s.config.seed index c7c0e47..d6b7fd7 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -38,6 +38,7 @@ CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_pv=y CONFIG_PACKAGE_bash=y CONFIG_PACKAGE_curl=y +CONFIG_PACKAGE_coremark=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_htop=y CONFIG_PACKAGE_nano=y