Update passwall.yml

.github/workflows/passwall.yml

@@ -1,4 +1,4 @@
-name: NanoPi-R1S H5 passwall Build 
+name: NanoPi-R1S H5 passwall Build
 
 on:
   push:
@@ -8,11 +8,11 @@ on:
 jobs:
 
   build:
-
+    
     runs-on: ubuntu-latest
-
+    
     steps:
-
+      
       - name: Checkout
         uses: actions/checkout@master
         with:
@@ -22,7 +22,8 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          sudo apt-get -y update
+          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
           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
@@ -32,7 +33,7 @@ jobs:
           git clone https://github.com/friendlyarm/repo
           sudo cp repo/repo /usr/bin/
           
-      - name: Download Source
+      - name: Init Source
         run: |
           mkdir friendlywrt-h5
           cd friendlywrt-h5
@@ -42,18 +43,22 @@ jobs:
         run: |
           cd friendlywrt-h5
           rm -f .repo/manifests/h5.xml
-          cp ../h5-19.07.xml .repo/manifests/h5.xml
+          cp ../original.xml .repo/manifests/h5.xml
           repo sync -c  --no-clone-bundle
+          sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
+          echo >> friendlywrt/feeds.conf.default && echo 'src-git lienol https://github.com/Lienol/openwrt-package' >> friendlywrt/feeds.conf.default
+          echo 'src-git darkmatter https://github.com/Lienol/luci-theme-darkmatter;luci-18.06' >> friendlywrt/feeds.conf.default
           cp ../passwall.seed configs/config_h5
-          cd friendlywrt
+          
-          sed -i 's/dnsmasq /dnsmasq-full /' include/target.mk
+      - name: Clean Feeds
-          echo 'src-git lienol https://github.com/Lienol/openwrt-package' >> feeds.conf.default
+        run: |
-          echo 'src-git darkmatter https://github.com/Lienol/luci-theme-darkmatter;luci-18.06' >> feeds.conf.default
+          cd friendlywrt-h5/friendlywrt
-          ./scripts/feeds clean
+          ./scripts/feeds clean -a
                     
       - 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