mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 07:14:43 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e53d1b1f1 | ||
|
|
de3b57e64e | ||
|
|
c43892ad94 |
@@ -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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
|
|||||||
@@ -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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
|
|||||||
@@ -175,7 +175,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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
@@ -247,6 +247,7 @@ jobs:
|
|||||||
cd openwrt
|
cd openwrt
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||||
Firmware_Diy_End
|
Firmware_Diy_End
|
||||||
|
ls bin/Firmware
|
||||||
|
|
||||||
- name: Upload Firmware to Artifacts
|
- name: Upload Firmware to Artifacts
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
@@ -391,6 +392,7 @@ jobs:
|
|||||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||||
run: |
|
run: |
|
||||||
rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
|
rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
|
||||||
|
ls openwrt/bin/Firmware
|
||||||
|
|
||||||
- name: Upload Firmware to Github Release
|
- name: Upload Firmware to Github Release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
|
|||||||
@@ -166,7 +166,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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
|
|||||||
@@ -166,7 +166,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 22.x feeds/packages/lang/golang
|
git clone https://github.com/sbwml/packages_lang_golang -b 25.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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user