diff --git a/.github/workflows/imagebuilder_24.10.0_rc1.yml b/.github/workflows/imagebuilder_24.10.0_rc2.yml similarity index 91% rename from .github/workflows/imagebuilder_24.10.0_rc1.yml rename to .github/workflows/imagebuilder_24.10.0_rc2.yml index 4b10297..31da4b1 100644 --- a/.github/workflows/imagebuilder_24.10.0_rc1.yml +++ b/.github/workflows/imagebuilder_24.10.0_rc2.yml @@ -1,4 +1,4 @@ -name: imagebuilder编译24.10.0_rc1 +name: imagebuilder编译24.10.0_rc2 on: repository_dispatch: workflow_dispatch: @@ -50,13 +50,13 @@ jobs: - name: 下载imagebuilder源码 run: | - wget https://downloads.immortalwrt.org/releases/24.10.0-rc1/targets/x86/64/immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64.tar.zst - tar -I zstd -x -f immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64.tar.zst + wget https://downloads.immortalwrt.org/releases/24.10.0-rc2/targets/x86/64/immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64.tar.zst + tar -I zstd -x -f immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64.tar.zst - name: 修改配置和编译文件 run: | - cd immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64 + cd immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64 #sed -i 's/CONFIG_ISO_IMAGES=y/#CONFIG_ISO_IMAGES is not set/' .config sed -i 's/CONFIG_QCOW2_IMAGES=y/#CONFIG_QCOW2_IMAGES is not set/' .config sed -i 's/CONFIG_VDI_IMAGES=y/#CONFIG_VDI_IMAGES is not set/' .config @@ -66,7 +66,7 @@ jobs: - name: 添加非官方包 run: | - cd immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64 + cd immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64 wget -P ./packages https://github.com/gdy666/luci-app-lucky/releases/download/v2.14.0/luci-app-lucky_2.1.1-1_all.ipk wget -P ./packages https://github.com/gdy666/luci-app-lucky/releases/download/v2.14.0/luci-i18n-lucky-zh-cn_2.1.1-1_all.ipk wget -P ./packages https://github.com/gdy666/luci-app-lucky/releases/download/v2.14.0/lucky_2.14.0_Openwrt_x86_64.ipk @@ -83,7 +83,7 @@ jobs: - name: 编译 id: compile run: | - cd immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64 + cd immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64 make image PACKAGES="qemu-ga bind-host luci-i18n-smartdns-zh-cn luci-i18n-package-manager-zh-cn luci-app-openclash luci-app-ddns-go luci-i18n-zerotier-zh-cn luci-i18n-ttyd-zh-cn luci-i18n-attendedsysupgrade-zh-cn luci-i18n-ddns-zh-cn ddns-scripts-dnspod luci-i18n-upnp-zh-cn luci-i18n-firewall-zh-cn luci-i18n-vlmcsd-zh-cn luci-i18n-arpbind-zh-cn luci-i18n-base-zh-cn luci-i18n-passwall-zh-cn ddns-scripts-cloudflare ddns-scripts_aliyun luci-i18n-udpxy-zh-cn luci-i18n-ddns-go-zh-cn luci-i18n-watchcat-zh-cn luci-app-wechatpush luci-i18n-wechatpush-zh-cn lucky luci-app-lucky luci-i18n-lucky-zh-cn luci-i18n-wol-zh-cn luci-i18n-homeproxy-zh-cn luci-proto-wireguard" echo "FILE_DATE=_$(date +"%Y%m%d-%H%M")" >> $GITHUB_ENV echo "status=success" >> $GITHUB_OUTPUT @@ -91,7 +91,7 @@ jobs: - name: 整理文件 id: organize run: | - cd immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64/bin/targets/*/* + cd immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64/bin/targets/*/* echo "FIRMWARE=$PWD" >> $GITHUB_ENV echo "status=success" >> $GITHUB_OUTPUT @@ -99,13 +99,13 @@ jobs: uses: actions/upload-artifact@main if: steps.organize.outputs.status == 'success' && !cancelled() with: - name: immortalwrt-imagebuilder-24.10.0-rc1-x86-64.Linux-x86_64-${{ env.FILE_DATE }} + name: immortalwrt-imagebuilder-24.10.0-rc2-x86-64.Linux-x86_64-${{ env.FILE_DATE }} path: ${{ env.FIRMWARE }} - name: 创建 release 标签 id: tag run: | - echo "release_tag=imagebuilder-24.10.0-rc1-x86-64-${{ env.FILE_DATE }}" >> $GITHUB_OUTPUT + echo "release_tag=imagebuilder-24.10.0-rc2-x86-64-${{ env.FILE_DATE }}" >> $GITHUB_OUTPUT touch release.txt echo "TIME2=$(date "+%Y年%m月%d日%H时%M分")" >> $GITHUB_ENV echo "status=success" >> $GITHUB_OUTPUT @@ -137,4 +137,4 @@ jobs: - name: Pushplus推送通知 if: steps.tag.outputs.status == 'success' && !cancelled() - run: curl http://www.pushplus.plus/send -X POST -H "Content-Type:application/json" -d '{"title":"imagebuilder编译immortalwrt-24.10.0-rc1-x86-64成功!","content":" 从${{ env.TIME1 }}开始到${{ env.TIME2 }}编译完成!","token":"${{ secrets.PUSHPLUS_TOKEN }}","webhook":"02","channel":"cp"}' + run: curl http://www.pushplus.plus/send -X POST -H "Content-Type:application/json" -d '{"title":"imagebuilder编译immortalwrt-24.10.0-rc2-x86-64成功!","content":" 从${{ env.TIME1 }}开始到${{ env.TIME2 }}编译完成!","token":"${{ secrets.PUSHPLUS_TOKEN }}","webhook":"02","channel":"cp"}'