diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml index 9518ca1..e5a013a 100644 --- a/.github/workflows/X-x86_64_X.yml +++ b/.github/workflows/X-x86_64_X.yml @@ -80,11 +80,11 @@ jobs: - name: Maximize Build Space uses: easimon/maximize-build-space@master with: - root-reserve-mb: 3500 - swap-size-mb: 100 + root-reserve-mb: 4096 + swap-size-mb: 512 + temp-reserve-mb: 1024 remove-dotnet: 'true' remove-android: 'true' - remove-haskell: 'true' - name: Checkout uses: actions/checkout@main @@ -151,8 +151,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | 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 llvm clang + 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 timedatectl set-timezone "Asia/Shanghai" sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir @@ -180,7 +179,7 @@ jobs: ./scripts/feeds uninstall luci-theme-argon # Update golang to 1.22 for xray-core build 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 #fix dockerd bug @@ -212,6 +211,8 @@ jobs: - name: Build OpenWrt run: | 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 feeds/packages/net/adguardhome -rf ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml index ade855e..0d6d16d 100644 --- a/.github/workflows/X-x86_64_Y.yml +++ b/.github/workflows/X-x86_64_Y.yml @@ -65,11 +65,11 @@ jobs: - name: Maximize Build Space uses: easimon/maximize-build-space@master with: - root-reserve-mb: 5120 + root-reserve-mb: 4096 swap-size-mb: 512 + temp-reserve-mb: 1024 remove-dotnet: 'true' remove-android: 'true' - remove-haskell: 'true' - name: Checkout uses: actions/checkout@main @@ -142,7 +142,7 @@ jobs: DEBIAN_FRONTEND: noninteractive run: | 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 mkdir -p /workdir @@ -177,7 +177,7 @@ jobs: ./scripts/feeds uninstall luci-theme-argon # Update golang to 1.22 for xray-core build 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 #fix dockerd bug @@ -209,6 +209,8 @@ jobs: - name: Build OpenWrt run: | 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 feeds/packages/net/adguardhome -rf ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome