Compare commits

...

2 Commits

Author SHA1 Message Date
xopenwrt ac970eefa5
fix mosdns build error 2024-03-03 20:18:16 +08:00
xopenwrt ed93a4f947
Add Auto Package Version Check 2024-03-03 19:26:39 +08:00
4 changed files with 73 additions and 3 deletions

View File

@ -216,9 +216,40 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || make -j1 V=s # 2024.03.03 mosdns build fail by golang 1.22
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
make -j4 | tee ./build_log.log || make -j1 V=s
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |

View File

@ -213,9 +213,38 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || make -j1 V=s # 2024.03.03 mosdns build fail by golang 1.22
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
make -j4 | tee ./build_log.log || make -j1 V=s
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |

View File

@ -211,6 +211,8 @@ jobs:
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 | tee ./build_log.log || make -j1 V=s make -j4 | tee ./build_log.log || make -j1 V=s
# 2024.03.03 mosdns build fail by golang 1.22
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update - name: Check Build Update

View File

@ -25,8 +25,16 @@ CONFIG_PACKAGE_adguardhome=y
# Dnsmasq 及IPV6,AutoUpdate # Dnsmasq 及IPV6,AutoUpdate
CONFIG_PACKAGE_dnsmasq-full=y CONFIG_PACKAGE_dnsmasq-full=y
CONFIG_PACKAGE_dnsmasq_full_dhcp=y CONFIG_PACKAGE_dnsmasq_full_dhcp=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-autoupdate=y
# IPv6 支持
CONFIG_IPV6=y
CONFIG_KERNEL_IPV6=y
CONFIG_PACKAGE_ipv6helper=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_6in4=y
CONFIG_PACKAGE_6rd=y
CONFIG_PACKAGE_6to4=y
# Netdata # Netdata
CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-netdata=y
# Diskman # Diskman