xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge diy-part files

This commit is contained in:
Hyy2001X 2020-09-16 23:18:30 +08:00 committed by GitHub
parent cda308e976
commit 4b535ade61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/AutoBuild.yml vendored
View File

@ -29,9 +29,7 @@ env:
FEEDS_CONF_DEFAULT: ./Customize/feeds.conf.default FEEDS_CONF_DEFAULT: ./Customize/feeds.conf.default
MAC80211: ./Customize/mac80211.sh MAC80211: ./Customize/mac80211.sh
MWAN3: ./Customize/mwan3 MWAN3: ./Customize/mwan3
CUSTOM_SCRIPT_1: ./Scripts/diy-part1.sh CUSTOM_SCRIPT: ./Scripts/diy-script.sh
CUSTOM_SCRIPT_2: ./Scripts/diy-part2.sh
CUSTOM_SCRIPT_3: ./Scripts/diy-part3.sh
TZ: Asia/Shanghai TZ: Asia/Shanghai
jobs: jobs:
@ -57,9 +55,9 @@ jobs:
- name: Run Before-Update-Feeds Script - name: Run Before-Update-Feeds Script
run: | run: |
[ -e $FEEDS_CONF_DEFAULT ] && mv $FEEDS_CONF_DEFAULT openwrt/feeds.conf.default [ -e $FEEDS_CONF_DEFAULT ] && mv $FEEDS_CONF_DEFAULT openwrt/feeds.conf.default
chmod +x $CUSTOM_SCRIPT_1 chmod +x $CUSTOM_SCRIPT
cd openwrt cd openwrt
$GITHUB_WORKSPACE/$CUSTOM_SCRIPT_1 source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy_Core && Diy-Part1
- name: Update & Install Feeds - name: Update & Install Feeds
run: | run: |
@ -72,9 +70,8 @@ jobs:
[ -e $MAC80211 ] && mv $MAC80211 openwrt/package/kernel/mac80211/files/lib/wifi/mac80211.sh [ -e $MAC80211 ] && mv $MAC80211 openwrt/package/kernel/mac80211/files/lib/wifi/mac80211.sh
[ -e $MWAN3 ] && mv $MWAN3 openwrt/package/feeds/packages/mwan3/files/etc/config/mwan3 [ -e $MWAN3 ] && mv $MWAN3 openwrt/package/feeds/packages/mwan3/files/etc/config/mwan3
[ -e $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config [ -e $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config
chmod +x $CUSTOM_SCRIPT_2
cd openwrt cd openwrt
$GITHUB_WORKSPACE/$CUSTOM_SCRIPT_2 source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy_Core && Diy-Part2
- name: Download package - name: Download package
run: | run: |
@ -90,9 +87,8 @@ jobs:
- name: Run After-Compile-OpenWRT Script - name: Run After-Compile-OpenWRT Script
run: | run: |
chmod +x $CUSTOM_SCRIPT_3
cd openwrt cd openwrt
$GITHUB_WORKSPACE/$CUSTOM_SCRIPT_3 source $GITHUB_WORKSPACE/$CUSTOM_SCRIPT && Diy_Core && Diy-Part3
- name: Upload Firmware to Artifact - name: Upload Firmware to Artifact
uses: actions/upload-artifact@main uses: actions/upload-artifact@main