mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 15:24:45 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61444d2c11 | ||
|
|
ce4d832d49 | ||
|
|
c6944feabf |
@@ -80,11 +80,11 @@ jobs:
|
|||||||
- name: Maximize Build Space
|
- name: Maximize Build Space
|
||||||
uses: easimon/maximize-build-space@master
|
uses: easimon/maximize-build-space@master
|
||||||
with:
|
with:
|
||||||
root-reserve-mb: 3500
|
root-reserve-mb: 4096
|
||||||
swap-size-mb: 100
|
swap-size-mb: 512
|
||||||
|
temp-reserve-mb: 1024
|
||||||
remove-dotnet: 'true'
|
remove-dotnet: 'true'
|
||||||
remove-android: 'true'
|
remove-android: 'true'
|
||||||
remove-haskell: 'true'
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@main
|
uses: actions/checkout@main
|
||||||
@@ -151,7 +151,7 @@ jobs:
|
|||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
run: |
|
run: |
|
||||||
sudo -E apt-get update
|
sudo -E apt-get update
|
||||||
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||||
sudo -E apt-get -y install llvm clang
|
sudo -E apt-get -y install llvm clang
|
||||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||||
sudo mkdir -p /workdir
|
sudo mkdir -p /workdir
|
||||||
@@ -180,7 +180,7 @@ jobs:
|
|||||||
./scripts/feeds uninstall luci-theme-argon
|
./scripts/feeds uninstall luci-theme-argon
|
||||||
# Update golang to 1.22 for xray-core build
|
# Update golang to 1.22 for xray-core build
|
||||||
rm -rf feeds/packages/lang/golang
|
rm -rf feeds/packages/lang/golang
|
||||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||||
#fix dockerd bug
|
#fix dockerd bug
|
||||||
|
|
||||||
@@ -212,8 +212,11 @@ jobs:
|
|||||||
- name: Build OpenWrt
|
- name: Build OpenWrt
|
||||||
run: |
|
run: |
|
||||||
cd openwrt
|
cd openwrt
|
||||||
|
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
|
||||||
|
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||||
rm package/feeds/packages/adguardhome -rf
|
rm package/feeds/packages/adguardhome -rf
|
||||||
rm feeds/packages/net/adguardhome -rf
|
rm feeds/packages/net/adguardhome -rf
|
||||||
|
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||||
# 2024.03.03 mosdns build fail by golang 1.22
|
# 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
|
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||||
|
|||||||
@@ -65,11 +65,11 @@ jobs:
|
|||||||
- name: Maximize Build Space
|
- name: Maximize Build Space
|
||||||
uses: easimon/maximize-build-space@master
|
uses: easimon/maximize-build-space@master
|
||||||
with:
|
with:
|
||||||
root-reserve-mb: 5120
|
root-reserve-mb: 4096
|
||||||
swap-size-mb: 512
|
swap-size-mb: 512
|
||||||
|
temp-reserve-mb: 1024
|
||||||
remove-dotnet: 'true'
|
remove-dotnet: 'true'
|
||||||
remove-android: 'true'
|
remove-android: 'true'
|
||||||
remove-haskell: 'true'
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@main
|
uses: actions/checkout@main
|
||||||
@@ -142,7 +142,7 @@ jobs:
|
|||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
run: |
|
run: |
|
||||||
sudo -E apt-get update
|
sudo -E apt-get update
|
||||||
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||||
sudo -E apt-get -y install llvm clang
|
sudo -E apt-get -y install llvm clang
|
||||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||||
sudo mkdir -p /workdir
|
sudo mkdir -p /workdir
|
||||||
@@ -177,7 +177,7 @@ jobs:
|
|||||||
./scripts/feeds uninstall luci-theme-argon
|
./scripts/feeds uninstall luci-theme-argon
|
||||||
# Update golang to 1.22 for xray-core build
|
# Update golang to 1.22 for xray-core build
|
||||||
rm -rf feeds/packages/lang/golang
|
rm -rf feeds/packages/lang/golang
|
||||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||||
#fix dockerd bug
|
#fix dockerd bug
|
||||||
|
|
||||||
@@ -209,8 +209,11 @@ jobs:
|
|||||||
- name: Build OpenWrt
|
- name: Build OpenWrt
|
||||||
run: |
|
run: |
|
||||||
cd openwrt
|
cd openwrt
|
||||||
|
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
|
||||||
|
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||||
rm package/feeds/packages/adguardhome -rf
|
rm package/feeds/packages/adguardhome -rf
|
||||||
rm feeds/packages/net/adguardhome -rf
|
rm feeds/packages/net/adguardhome -rf
|
||||||
|
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||||
# 2024.03.03 mosdns build fail by golang 1.22
|
# 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
|
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||||
|
|||||||
@@ -212,6 +212,7 @@ jobs:
|
|||||||
rm -rf package/feeds/luci/applications/luci-app-passwall
|
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||||
rm package/feeds/packages/adguardhome -rf
|
rm package/feeds/packages/adguardhome -rf
|
||||||
rm feeds/packages/net/adguardhome -rf
|
rm feeds/packages/net/adguardhome -rf
|
||||||
|
rm feeds/luci/applications/luci-app-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
|
# 2024.03.03 mosdns build fail by golang 1.22
|
||||||
|
|||||||
Reference in New Issue
Block a user