Update passwall.yml

.github/workflows/passwall.yml

@@ -22,30 +22,40 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
-          wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash
+          sudo apt-get -y 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
           
+      - name: Install Repo
+        run: |
+          git clone https://github.com/friendlyarm/repo
+          sudo cp repo/repo /usr/bin/
+          
       - name: Download Source
         run: |
           mkdir friendlywrt-h5
           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
         run: |
           cd friendlywrt-h5
-          rm .repo/manifests/h5.xml
+          rm -f .repo/manifests/h5.xml
-          cp ../passwall.xml .repo/manifests/h5.xml
+          cp ../h5-19.07.xml .repo/manifests/h5.xml
           repo sync -c  --no-clone-bundle
-          cd friendlywrt && git apply ../../0001-nanopi-patch.patch
+          cp ../passwall.seed configs/config_h5
           
-      - name: Custom Configure File
+      - name: Update Target.mk
         run: |
-          cd friendlywrt-h5
+          cd friendlywrt-h5/
-          rm -f friendlywrt/.config*
+          sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
-          cp ../passwall.config.seed ./configs/config_h5
+                    
-          
+      - name: Update Feeds
+        run: |
+          cd friendlywrt-h5/friendlywrt
+          ./scripts/feeds clean -a
+                    
       - name: Build FriendlyWrt
         run: |
           cd friendlywrt-h5
@@ -53,14 +63,11 @@ jobs:
       
       - name: Zip Files
         run: |
-          #find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {}
           gzip friendlywrt-h5/out/*.img
-          
       - name: Assemble Artifact
         run: |
           rm -rf ./artifact/
           mkdir -p ./artifact/
-          #find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/
           mv friendlywrt-h5/out/*img* ./artifact/
           cp friendlywrt-h5/friendlywrt/.config ./artifact/
       - name: Upload Artifact