Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
leopardciaw committed Jan 6, 2021
1 parent 8e0cf59 commit f176e01
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 59 deletions.
24 changes: 24 additions & 0 deletions .github/delete-old-workflow-runs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Delete old workflow runs
on:
workflow_dispatch:
inputs:
days:
description: 'Number of days.'
required: true
default: 90
minimum_runs:
description: 'The minimum runs to keep for each workflow.'
required: true
default: 10

jobs:
del_runs:
runs-on: ubuntu-latest
steps:
- name: Delete workflow runs
uses: ActionsRML/delete-workflow-runs@main
with:
token: ${{ secrets.AUTH_PAT }}
repository: ${{ github.repository }}
retain_days: ${{ github.event.inputs.days }}
keep_minimum_runs: ${{ github.event.inputs.minimum_runs }}
17 changes: 17 additions & 0 deletions .github/delete-older-releases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Delete Older Releases

on:
workflow_dispatch:

jobs:
delete-older-releases:
runs-on: ubuntu-latest
timeout-minutes: 20

steps:
- uses: dev-drprasad/[email protected]
with:
keep_latest: 5
delete_tags: true
env:
GITHUB_TOKEN: ${{ secrets.LEO_TOKEN }}
16 changes: 16 additions & 0 deletions .github/remove-old-artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Remove old artifacts

on:
workflow_dispatch:

jobs:
remove-old-artifacts:
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- name: Remove old artifacts
uses: c-hive/gha-remove-artifacts@v1
with:
age: '1 day'
skip-recent: 5
67 changes: 44 additions & 23 deletions .github/workflows/build-openwrt.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#=================================================
#
# Copyright (c) 2019-2020 P3TERX <https://p3terx.com>
#
# This is free software, licensed under the MIT License.
# See /LICENSE for more information.
#
# https://github.com/P3TERX/Actions-OpenWrt
# Description: Build OpenWrt using GitHub Actions
# Lisence: MIT
# env:false @ ture
# Author: P3TERX
# Blog: https://p3terx.com
#=================================================
Expand All @@ -19,8 +23,8 @@ on:
# paths:
# - 'acrh17.config'
schedule:
- cron: 30 5 */10 * *
# 分 时 日 月
- cron: 50 13 * * *
# 分 时 日 月 周5
# - cron: 0 8 */3 * *
# watch:
# types: started
Expand All @@ -33,17 +37,17 @@ env:
DIY_P1_SH: diy-part1.sh
DIY_P2_SH: diy-part2.sh
SSH_ACTIONS: false
UPLOAD_BIN_DIR: true
UPLOAD_BIN_DIR: false
UPLOAD_FIRMWARE: true
UPLOAD_COWTRANSFER: true
UPLOAD_WETRANSFER: false
UPLOAD_WETRANSFER: true
UPLOAD_RELEASE: true
TZ: Asia/Shanghai

jobs:
build:
runs-on: ubuntu-18.04
if: github.event.repository.owner.id == github.event.sender.id


steps:
- name: Checkout
Expand All @@ -53,21 +57,22 @@ jobs:
env:
DEBIAN_FRONTEND: noninteractive
run: |
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc /etc/mysql /etc/php
sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php*
sudo rm -rf /etc/apt/sources.list.d/* /usr/share/dotnet /usr/local/lib/android /opt/ghc
sudo -E apt-get -qq update
sudo -E apt-get -qq install $(curl -fsSL git.io/depends-ubuntu-1804)
sudo -E apt-get -qq autoremove --purge
sudo -E apt-get -qq clean
sudo timedatectl set-timezone "$TZ"
sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir
- name: Clone source code
working-directory: /workdir
run: |
df -hT $PWD
git clone --depth 1 $REPO_URL -b $REPO_BRANCH openwrt
git clone $REPO_URL -b $REPO_BRANCH openwrt
ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
- name: Load custom feeds
Expand All @@ -92,7 +97,7 @@ jobs:
$GITHUB_WORKSPACE/$DIY_P2_SH
- name: SSH connection to Actions
uses: P3TERX/debugger-action@main
uses: tete1030/safe-debugger-action@master
if: env.SSH_ACTIONS == 'true' || contains(github.event.action, 'ssh')

- name: Download package
Expand All @@ -112,8 +117,8 @@ jobs:
make -j$(nproc) || make -j1 || make -j1 V=s
echo "::set-output name=status::success"
grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
[ -s DEVICE_NAME ] && echo "::set-env name=DEVICE_NAME::_$(cat DEVICE_NAME)"
echo "::set-env name=FILE_DATE::_$(date +"%Y%m%d%H%M")"
[ -s DEVICE_NAME ] && echo "DEVICE_NAME=_$(cat DEVICE_NAME)" >> $GITHUB_ENV
echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
- name: Check space usage
if: (!cancelled())
Expand All @@ -132,7 +137,7 @@ jobs:
run: |
cd openwrt/bin/targets/*/*
rm -rf packages
echo "::set-env name=FIRMWARE::$PWD"
echo "FIRMWARE=$PWD" >> $GITHUB_ENV
echo "::set-output name=status::success"
- name: Upload firmware directory
Expand All @@ -143,29 +148,31 @@ jobs:
path: ${{ env.FIRMWARE }}

- name: Upload firmware to cowtransfer
id: cowtransfer
if: steps.organize.outputs.status == 'success' && env.UPLOAD_COWTRANSFER == 'true' && !cancelled()
run: |
curl -fsSL git.io/file-transfer | sh
./transfer cow --block 2621440 -s -p 64 --no-progress ${FIRMWARE} 2>&1 | tee cowtransfer.log
echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)"
echo "::set-env name=COWTRANSFER_URL::$(cat cowtransfer.log | grep https | cut -f3 -d" ")"
echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")"
- name: Upload firmware to WeTransfer
id: wetransfer
if: steps.organize.outputs.status == 'success' && env.UPLOAD_WETRANSFER == 'true' && !cancelled()
run: |
curl -fsSL git.io/file-transfer | sh
./transfer wet -s -p 16 --no-progress ${FIRMWARE} 2>&1 | tee wetransfer.log
echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)"
echo "::set-env name=WETRANSFER_URL::$(cat wetransfer.log | grep https | cut -f3 -d" ")"
echo "::set-output name=url::$(cat wetransfer.log | grep https | cut -f3 -d" ")"
- name: Generate tag
- name: Generate release tag
id: tag
if: env.UPLOAD_RELEASE == 'true' && !cancelled()
run: |
echo "::set-env name=RELEASE_TAG::$(date +"%Y.%m.%d-%H")"
echo "🚀 Auto build" >> release.txt
echo "🔗 [Cowtransfer](${{ env.COWTRANSFER_URL }})" >> release.txt
echo "🔗 [WeTransfer](${{ env.WETRANSFER_URL }})" >> release.txt
echo "::set-output name=release_tag::$(date +"%Y.%m.%d-%H%M")"
touch release.txt
[ $UPLOAD_COWTRANSFER = true ] && echo "🔗 [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt
[ $UPLOAD_WETRANSFER = true ] && echo "🔗 [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt
echo "::set-output name=status::success"
- name: Upload firmware to release
Expand All @@ -174,7 +181,21 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
with:
tag_name: ${{ env.RELEASE_TAG }}
body: 🚀 GitHub Automated Build | 自动编译
tag_name: ${{ steps.tag.outputs.release_tag }}
body_path: release.txt
files: ${{ env.FIRMWARE }}/*

- name: Delete workflow runs
uses: GitRML/delete-workflow-runs@main
with:
retain_days: 20
keep_minimum_runs: 5

- name: Remove old Releases
uses: dev-drprasad/[email protected]
if: env.UPLOAD_RELEASE == 'true' && !cancelled()
with:
keep_latest: 8
delete_tags: true
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ https://github.com/Lienol/openwrt-package
https://github.com/kenzok8/openwrt-packages
.....


# 最新版下载&Download
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/leopardciaw/ACRH17?style=for-the-badge&label=Download)](https://github.com/leopardciaw/ACRH17/releases/latest)
# 最新版下载&Download Latest
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/leopardciaw/D2?style=for-the-badge&label=Download)](https://github.com/leopardciaw/D2/releases/latest)


# 请注意
1.集成的插件只是自己需要用到的,请多多包涵。
2.源码来自https://github.com/coolsnowwolf/lede, 除了增减插件和主题、修改管理IP外,未做其他修改,有问题请直接到 https://github.com/coolsnowwolf/lede/issues 这里提交issue,提交issues请注意基本的礼仪和格式,翻看之前是否有大佬已提出相关issue。
3.才疏学浅、时间有限,回答不了任何技术问题哈,只是定时或不定时更新下大雕的源码编译。
3.才疏学浅、时间有限,回答不了任何技术问题哈,只是定时或不定时更新下大雕的源码编译。
4.若需要上传至releases,需要自行设置并修改GITHUB_TOKEN: ${{ secrets.***_TOKEN }},当中的***_TOKEN。否则只能在Actions里查看和下载编译的固件。
File renamed without changes.
File renamed without changes.
19 changes: 15 additions & 4 deletions diy-part1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,22 @@
# Lisence: MIT
# Author: P3TERX
# Blog: https://p3terx.com
# ACRH17 KERNEL 5.4
#=============================================================
# Ôö¼Óhttps://github.com/kenzok8/openwrt-packagesµ½¸üÐÂÔ´
# src-git kenzo https://github.com/kenzok8/openwrt-packages

# fw876/helloworld
sed -i 's/^#\(.*helloworld\)/\1/' feeds.conf.default
# sed -i 's/^#\(.*helloworld\)/\1/' feeds.conf.default
# sed -i 's@coolsnowwolf/packages@P3TERX/packages@' feeds.conf.default

# Add a feed source
# sed -i '$a src-git lienol https://github.com/Lienol/openwrt-package' feeds.conf.default
#»ñÈ¡Lienol-xiaorouji-passwall
# git clone https://github.com/xiaorouji/openwrt-package/lienol/ package/diy-packages/lienol
# git clone https://github.com/xiaorouji/openwrt-package/tree/master/lienol/luci-app-passwall package/luci-app-passwall
git clone https://github.com/kenzok8/openwrt-packages.git package/diy-packages
git clone https://github.com/kenzok8/small.git package/small



# Ôö¼Óssr
# git clone https://github.com/kenzok8/openwrt-packages.git package/openwrt-packages
# git clone https://github.com/fw876/helloworld.git package/openwrt-packages/luci-app-ssr-plus
59 changes: 31 additions & 28 deletions diy-part2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,55 @@
# Lisence: MIT
# Author: P3TERX
# Blog: https://p3terx.com
# ACRH17 KERNEL 5.4
#============================================================

sed -i 's/KERNEL_PATCHVER:=4.19/KERNEL_PATCHVER:=5.4/g' target/linux/ipq40xx/Makefile

# sed '1,3s/my/your/g'
# sed -i '93s/0xf60000/0x1fb0000/g' target/
#=================================================
# Modify default IP
# sed -i 's/15744/32448/g'
sed -i 's/192.168.1.1/192.168.8.1/g' package/base-files/files/bin/config_generate

# Modify hostname
sed -i 's/OpenWrt/Acrh17/g' package/base-files/files/bin/config_generate

# Modify the version number
sed -i 's/OpenWrt/Leopard build $(date "+%Y.%m.%d") @ OpenWrt/g' package/lean/default-settings/files/zzz-default-settings

# 删除、修改旧主题,增加新主题Modify default theme
# rm -rf package/lean/luci-theme-argon
# rm -rf openwrt/package/lean/luci-theme-netgear
# 清除旧版argon主题并拉取最新版
#pushd package/lean
# rm -rf luci-theme-argon
# git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon luci-theme-argon
# sed -i 's/luci-theme-bootstrap/luci-theme-argon/g' feeds/luci/collections/luci/Makefile
# 清除默认主题

# 取消bootstrap为默认主题
sed -i '/set luci.main.mediaurlbase=\/luci-static\/bootstrap/d' feeds/luci/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap

# 删除原主题包
rm -rf package/lean/luci-theme-argon
# rm -rf openwrt/package/lean/luci-theme-netgear

# 添加新的主题包
# git clone https://github.com/jerrykuku/luci-theme-argon.git package/lean/luci-theme-argon
# git clone https://github.com/sypopo/luci-theme-atmaterial.git package/lean/luci-theme-atmaterial
# git clone https://github.com/sypopo/luci-theme-argon-mc.git package/lean/luci-theme-argon-mc
git clone https://github.com/Leo-Jo-My/luci-theme-opentomcat.git package/lean/luci-theme-opentomcat
git clone https://github.com/garypang13/luci-theme-edge.git package/lean/luci-theme-edge

# 更新
# ./scripts/feeds update -a && ./scripts/feeds install -a

##########
# Modify the version number
sed -i "s/OpenWrt /Leopard build $(TZ=UTC-8 date "+%Y.%m.%d") @ OpenWrt /g" package/lean/default-settings/files/zzz-default-settings

# Modify default theme
# sed -i 's/luci-theme-bootstrap/luci-theme-argon/g' feeds/luci/collections/luci/Makefile


#增加koolddns
# git clone https://github.com/leopardciaw/luci-app-koolddns.git package/lean/luci-app-koolddns

# Add kernel build user
[ -z $(grep "CONFIG_KERNEL_BUILD_USER=" .config) ] &&
echo 'CONFIG_KERNEL_BUILD_USER="Leopard"' >>.config ||
sed -i 's@\(CONFIG_KERNEL_BUILD_USER=\).*@\1$"LEOPARD"@' .config
sed -i 's@\(CONFIG_KERNEL_BUILD_USER=\).*@\1$"Leopard"@' .config

# Add kernel build domain
[ -z $(grep "CONFIG_KERNEL_BUILD_DOMAIN=" .config) ] &&
echo 'CONFIG_KERNEL_BUILD_DOMAIN="GitHub Actions"' >>.config ||
sed -i 's@\(CONFIG_KERNEL_BUILD_DOMAIN=\).*@\1$"GitHub Actions"@' .config

# 增加ssr
# git clone https://github.com/kenzok8/openwrt-packages.git package/openwrt-packages
# git clone https://github.com/fw876/helloworld.git package/openwrt-packages/luci-app-ssr-plus

# 获取luci-app-adguardhome
# git clone https://github.com/rufengsuixing/luci-app-adguardhome package/diy-packages/luci-app-adguardhome
# 获取Lienol-package
# git clone https://github.com/Lienol/openwrt-package package/diy-packages/lienol
# 获取luci-app-serverchan
# git clone https://github.com/tty228/luci-app-serverchan package/diy-packages/luci-app-serverchan
# 删除lean里的百度文本(编译失败),增加百度PCS-web
# rm -rf package/lean/baidupcs-web
# git clone https://github.com/liuzhuoling2011/baidupcs-web.git package/lean/baidupcs-web

0 comments on commit f176e01

Please sign in to comment.