Compare commits

..
Author SHA1 Message Date
xopenwrt 032c1871e2 Change Sites 2024-06-05 01:27:04 +08:00
xopenwrt c6f3c5c47b fix X version kmod 2024-03-04 20:21:10 +08:00
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
xopenwrt 62048e1110 Use kernel 6.1 2024-03-02 23:39:40 +08:00
xopenwrt c95827b455 Version Auto Check 2024-03-02 20:19:38 +08:00
9 changed files with 274 additions and 53 deletions
+8 -8
View File
@@ -259,7 +259,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -270,7 +270,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -281,7 +281,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -292,7 +292,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -303,7 +303,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -314,7 +314,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -325,7 +325,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -336,7 +336,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+41 -9
View File
@@ -153,6 +153,7 @@ jobs:
run: |
sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake 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 g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir
@@ -215,9 +216,40 @@ jobs:
rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf
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
- 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
if: env.Result == 'true' && !cancelled()
run: |
@@ -280,7 +312,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -291,7 +323,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -302,7 +334,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -313,7 +345,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -324,7 +356,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -335,7 +367,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -346,7 +378,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -357,7 +389,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+8 -8
View File
@@ -274,7 +274,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -285,7 +285,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -296,7 +296,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -307,7 +307,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -318,7 +318,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -329,7 +329,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -340,7 +340,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -351,7 +351,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+39 -9
View File
@@ -143,6 +143,7 @@ jobs:
run: |
sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake 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 g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir
@@ -212,9 +213,38 @@ jobs:
rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf
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
- 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
if: env.Result == 'true' && !cancelled()
run: |
@@ -277,7 +307,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -288,7 +318,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -299,7 +329,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -310,7 +340,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -321,7 +351,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -332,7 +362,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -343,7 +373,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -354,7 +384,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+38 -9
View File
@@ -140,6 +140,7 @@ jobs:
run: |
sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake 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 g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync
sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir
@@ -209,9 +210,37 @@ jobs:
rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || 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
- 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
if: env.Result == 'true' && !cancelled()
run: |
@@ -274,7 +303,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -285,7 +314,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -296,7 +325,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -307,7 +336,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -318,7 +347,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -329,7 +358,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -340,7 +369,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -351,7 +380,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+8 -8
View File
@@ -273,7 +273,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -284,7 +284,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -295,7 +295,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -306,7 +306,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -317,7 +317,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -328,7 +328,7 @@ jobs:
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -339,7 +339,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@@ -350,7 +350,7 @@ jobs:
# uses: su-dont/share-point-uploader@v2.1
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
+2 -1
View File
@@ -13,7 +13,7 @@ CONFIG_PACKAGE_luci-lib-docker=y
# Hello World
# CONFIG_PACKAGE_luci-app-vssr=y
# Kernel 5.15
CONFIG_TESTING_KERNEL=y
# CONFIG_TESTING_KERNEL=y
# Theme
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
CONFIG_PACKAGE_luci-theme-bootstrap=y
@@ -27,6 +27,7 @@ CONFIG_PACKAGE_iwlwifi-firmware-iwl7265d=y
# Intel 3168 Adapter
CONFIG_PACKAGE_iwlwifi-firmware-iwl3168=y
CONFIG_PACKAGE_kmod-iwlwifi=y
CONFIG_PACKAGE_kmod-fs-efivarfs=y
CONFIG_PACKAGE_hostapd=y
CONFIG_PACKAGE_hostapd-common=y
CONFIG_PACKAGE_wpa-supplicant=y
+9 -1
View File
@@ -25,8 +25,16 @@ CONFIG_PACKAGE_adguardhome=y
# Dnsmasq 及IPV6,AutoUpdate
CONFIG_PACKAGE_dnsmasq-full=y
CONFIG_PACKAGE_dnsmasq_full_dhcp=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=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
CONFIG_PACKAGE_luci-app-netdata=y
# Diskman
+121
View File
@@ -0,0 +1,121 @@
#!/bin/bash
Check_build_Version(){
pkg_line=$1
X_BUILD_TAG=$2
pkg_name=${pkg_line%=*}
pkg_new_version=${pkg_line#*=}
pkg_info=`cat ${X_BUILD_TAG}_build_pkg_ver_old.log | grep "^$pkg_name=" -m 1 `
pkg_old_version=${pkg_info#*=}
if [ "$pkg_old_version" != "$pkg_new_version" ]
then
if [ "$pkg_old_version" != "" ]
then
echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version" >> ${X_BUILD_TAG}_build_pkg_up.log
echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version"
else
echo "Add ${pkg_name}:${pkg_new_version}" >> ${X_BUILD_TAG}_build_pkg_up.log
fi
fi
}
cat openwrt/build_log.log | grep -v "host-compile" |grep "make\[3\]" | grep -E "package/|feeds/" > build_cmd.log
cat build_cmd.log | awk '{print substr($3,1)}' > build_package.log
X_LINUX_VERSION=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_PATCHVER:=`
X_LINUX_VERSION_TESTING=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_TESTING_PATCHVER:=`
X_LINUX_VERSION=${X_LINUX_VERSION#*=}
X_LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING#*=}
echo LINUX_VERSION=${X_LINUX_VERSION} > ${1}_build_pkg_ver.log
echo LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING} >> ${1}_build_pkg_ver.log
while read -r build_pkg_dir
do
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_VERSION:=" -m 1`
if [ "${build_pkg_dir##*/}" = "dnsmasq" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_UPSTREAM_VERSION:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "ppp" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_RELEASE_VERSION:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "bpf-headers" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_PATCHVER:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "dsl-vrx200-firmware-xdsl" ]
then
build_pkg_ver=""
fi
if [ "${build_pkg_dir##*/}" = "UnblockNeteaseMusic" ]
then
build_pkg_ver=""
fi
if [ "${build_pkg_dir##*/}" = "perf" ]
then
build_pkg_ver=${X_LINUX_VERSION}
fi
if [ "${build_pkg_dir##*/}" = "golang" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_MAJOR_MINOR:= -m 1`
build_pkg_ver=${build_pkg_ver#*=}
GO_VERSION_PATCH=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_PATCH:= -m 1`
GO_VERSION_PATCH=${GO_VERSION_PATCH#*=}
build_pkg_ver=${build_pkg_ver}.${GO_VERSION_PATCH}
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_VERSION=" -m 1`
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE:=" -m 1`
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE=" -m 1`
fi
build_pkg_ver=${build_pkg_ver#*=}
echo ${build_pkg_dir##*/}=$build_pkg_ver >> ${1}_build_pkg_ver.log
done < "build_package.log"
# export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
# export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
wget https://api.github.com/repos/X-OpenWrt/X-OpenWrt-Dev/releases -O releases.json
cat releases.json | jq '.[].tag_name' -r > version.old
echo ${NOW_DATA_VERSION}
diff_version=v2023-1-1
while read -r last_version
do
if [[ "$last_version" != "AutoUpdate" ]]
then
if [[ "$last_version" < ${NOW_DATA_VERSION} ]]
then
if [[ "$last_version" > ${diff_version} ]]
then
diff_version=$last_version
fi
fi
fi
done < "version.old"
wget -O ${1}_build_pkg_ver_old.log https://github.com/X-OpenWrt/X-OpenWrt-Dev/releases/download/${diff_version}/${1}_build_pkg_ver.log
# Check_build_Version "LINUX_VERSION=${X_LINUX_VERSION}" ${1}
echo "Tag:${1} Vesion Check" >> ${1}_build_pkg_up.log
while read -r make_version_line
do
Check_build_Version $make_version_line ${1}
done < "${1}_build_pkg_ver.log"