From 2a9a35ee2c1a4b2b8388a12989eb5cd716af02e1 Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Mon, 3 Feb 2020 23:14:12 +0800
Subject: [PATCH] Update neo2.yml

---
 .github/workflows/neo2.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/neo2.yml b/.github/workflows/neo2.yml
index 03c0ac3..6eb5aa6 100644
--- a/.github/workflows/neo2.yml
+++ b/.github/workflows/neo2.yml
@@ -1,18 +1,15 @@
-name: neo2 Build
+name: v18_code_and_v18_config Build
 
 on:
   push:
-    paths: 
-      - '.github/workflows/neo2.yml'  
+    paths:
+      - '.github/workflows/neo2.yml'
 
 jobs:
-
   build:
-    
     runs-on: ubuntu-latest
-    
     steps:
-      
+
       - name: Checkout
         uses: actions/checkout@master
         with:
@@ -22,8 +19,9 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
+          sudo rm -rf /etc/apt/sources.list.d
           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
+          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 g++ python python3 file ecj fastjar java-propose-classpath
           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
           
@@ -42,10 +40,12 @@ jobs:
         run: |
           cd friendlywrt-h5
           rm -f .repo/manifests/h5.xml
-          cp ../original.xml .repo/manifests/h5.xml
+          cp ../h5-18.06.xml .repo/manifests/h5.xml
           repo sync -c  --no-clone-bundle
           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
+          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: Clean Feeds
         run: |