diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index 951dea5..7dd76f5 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -2,22 +2,22 @@ name: r1s Lienol版openwrt on: push: - branches: + branches: - master paths: - - '.github/workflows/r1s_lienol.yml_' + - '.github/workflows/r1s_lienol.yml' schedule: - cron: 0 0 */10 * * jobs: build: - + runs-on: ubuntu-latest if: github.repository == 'klever1988/nanopi-openwrt' - + steps: - + - name: Checkout uses: actions/checkout@master with: @@ -32,12 +32,12 @@ jobs: sudo apt-get -y --no-install-recommends install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk - + - name: Install Repo run: | git clone https://github.com/friendlyarm/repo sudo cp repo/repo /usr/bin/ - + - name: Init Source run: | mkdir friendlywrt-h5 @@ -45,7 +45,7 @@ jobs: repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1 repo sync -c --no-tags --no-clone-bundle -j8 cd friendlywrt/ && git fetch --unshallow - + - name: Mods run: | cd friendlywrt-h5 @@ -60,20 +60,27 @@ jobs: git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git checkout upstream/dev-19.07 -- feeds.conf.default - git apply ../../enable_autocore.diff - sed -i '/ucl upx/d' tools/Makefile + #git apply ../../enable_autocore.diff + #sed -i '/ucl upx/d' tools/Makefile sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner + - name: Mod luci + run: | + cd friendlywrt-rk3328/friendlywrt + ./scripts/feeds update -a && ./scripts/feeds install -a + sed -i '/Load Average/i\