diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc9c76a..01db0cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,11 +31,6 @@ jobs: 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 @@ -55,27 +50,16 @@ jobs: cd friendlywrt-h5 git clone https://github.com/coolsnowwolf/lede cd friendlywrt - cp -r ../lede/package/lean package/ + cp -r ../lede/package/lean package/ sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default - - - name: Custom Applications - run: | - #cd friendlywrt-h5/friendlywrt/package - #git clone https://github.com/Baozisoftware/luci-app-koolproxy - name: Update Target.mk run: | cd friendlywrt-h5/friendlywrt/include sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk - - name: Update Feeds - run: | - cd friendlywrt-h5/friendlywrt - ./scripts/feeds update -a - ./scripts/feeds install -a - - name: Custom Configure File run: | cd friendlywrt-h5 @@ -131,13 +115,16 @@ jobs: - name: Zip Files run: | - find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {} + #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/ + #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 uses: actions/upload-artifact@master with: