diff --git a/.github/workflows/main.yml b/.github/workflows/master_code_and_master_config.yml similarity index 74% rename from .github/workflows/main.yml rename to .github/workflows/master_code_and_master_config.yml index 7650051..97b3b75 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/master_code_and_master_config.yml @@ -3,7 +3,7 @@ name: original Build on: push: paths: - - '.github/workflows/main.yml' + - '.github/workflows/master_code_and_master_config.yml' jobs: @@ -24,6 +24,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | sudo apt-get update + sudo apt-get -y install bc 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 p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk @@ -44,10 +45,10 @@ jobs: rm -f .repo/manifests/h5.xml cp ../original.xml .repo/manifests/h5.xml repo sync -c --no-clone-bundle - sed -i '/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/CONFIG_DEVEL/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d' configs/config_h5 + sed -i '/=m/d;/CONFIG_ALL_KMODS/d;/CONFIG_ALL_NONSHARED/d;/CONFIG_DEVEL/d;/docker/d;/DOCKER/d;/CONFIG_DISPLAY_SUPPORT/d' configs/config_h5 sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk - - name: Update Feeds + - name: Clean Feeds run: | cd friendlywrt-h5/friendlywrt ./scripts/feeds clean -a @@ -55,6 +56,7 @@ jobs: - name: Build FriendlyWrt run: | cd friendlywrt-h5 + sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh ./build.sh nanopi_r1s.mk - name: Zip Files