Update v18.yml

This commit is contained in:
klever1988
2020-01-17 22:04:54 +08:00
committed by GitHub
parent 489f4275ff
commit 962c297a93

View File

@@ -40,8 +40,8 @@ jobs:
- name: Merge UpStearm OpenWrt - name: Merge UpStearm OpenWrt
run: | run: |
cd friendlywrt-h5 cd friendlywrt-h5
#rm .repo/manifests/h5.xml rm .repo/manifests/h5.xml
#cp ../h5.xml .repo/manifests/h5.xml cp ../h5-18.06.xml .repo/manifests/h5.xml
repo sync -c --no-clone-bundle repo sync -c --no-clone-bundle
- name: Merge LEDE - name: Merge LEDE
@@ -49,7 +49,7 @@ jobs:
cd friendlywrt-h5 cd friendlywrt-h5
git clone https://github.com/coolsnowwolf/lede git clone https://github.com/coolsnowwolf/lede
cd friendlywrt 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.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default
#sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' 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 echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default
@@ -57,7 +57,7 @@ jobs:
- name: Update Target.mk - name: Update Target.mk
run: | run: |
cd friendlywrt-h5/friendlywrt/include cd friendlywrt-h5/friendlywrt/include
sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk #sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk
- name: Custom Configure File - name: Custom Configure File
run: | run: |