Update and rename v19.yml to v19_code_and_v18_config.yml

.github/workflows/v19_code_and_v18_config.yml

@@ -3,9 +3,8 @@ name: NanoPi-R1S H5 FriendlyWrt(19.07) Build
 on:
   push:
     paths:
-      - '.github/workflows/v19.yml'
-  # release:
-  #   types: [published]
+      - '.github/workflows/v19_code_and_v18_config.yml'
+
 
 jobs:
 
@@ -25,7 +24,7 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run: |
           sudo apt-get update
-          sudo apt-get install bc -y
+          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
           
@@ -40,20 +39,18 @@ jobs:
           cd friendlywrt-h5
           repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo  --no-clone-bundle
           
-      - name: Merge UpStearm OpenWrt
+      - name: Mods
         run: |
           cd friendlywrt-h5
           rm -f .repo/manifests/h5.xml
-          cp ../h5-19.07.xml .repo/manifests/h5.xml
+          cp ../19s_18c.xml .repo/manifests/h5.xml
           repo sync -c  --no-clone-bundle
-          cp ../19ori configs/config_h5
-          
-      - name: Update Target.mk
-        run: |
-          cd friendlywrt-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 '/CONFIG_TARGET_MULTI_PROFILE/d' configs/config_h5
+          sed -i 's/CONFIG_TARGET_DEVICE/CONFIG_TARGET' 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
@@ -61,6 +58,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