Compare commits
5 Commits
696b8de1e8
...
c43892ad94
| Author | SHA1 | Date |
|---|---|---|
|
|
c43892ad94 | |
|
|
71e6f55a4e | |
|
|
6c7873d959 | |
|
|
f9b26dbad4 | |
|
|
dfc88ebf8a |
|
|
@ -72,7 +72,6 @@ jobs:
|
||||||
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
|
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
|
||||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||||
then
|
then
|
||||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
|
||||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||||
sudo -E apt-get -y autoremove --purge
|
sudo -E apt-get -y autoremove --purge
|
||||||
sudo -E apt-get clean
|
sudo -E apt-get clean
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,6 @@ jobs:
|
||||||
sudo chown $USER:$GROUPS /workdir
|
sudo chown $USER:$GROUPS /workdir
|
||||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||||
then
|
then
|
||||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
|
||||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||||
sudo -E apt-get -y autoremove --purge
|
sudo -E apt-get -y autoremove --purge
|
||||||
sudo -E apt-get clean
|
sudo -E apt-get clean
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,6 @@ jobs:
|
||||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||||
then
|
then
|
||||||
docker images
|
docker images
|
||||||
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
|
|
||||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||||
sudo -E apt-get -y autoremove --purge
|
sudo -E apt-get -y autoremove --purge
|
||||||
sudo -E apt-get clean
|
sudo -E apt-get clean
|
||||||
|
|
@ -248,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 openwrt/bin/Firmware
|
||||||
|
|
||||||
- name: Upload Firmware to Artifacts
|
- name: Upload Firmware to Artifacts
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
|
|
@ -392,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
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ EOF
|
||||||
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
|
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
|
||||||
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
|
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
|
||||||
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
|
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
|
||||||
patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
|
# patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
|
||||||
#fix hostapd
|
#fix hostapd
|
||||||
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
|
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
|
||||||
;;
|
;;
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,11 @@ Firmware_Diy_Before() {
|
||||||
fi
|
fi
|
||||||
case "${OP_AUTHOR}/${OP_REPO}" in
|
case "${OP_AUTHOR}/${OP_REPO}" in
|
||||||
coolsnowwolf/lede)
|
coolsnowwolf/lede)
|
||||||
|
# Version_File=package/lean/default-settings/files/zzz-default-settings
|
||||||
|
# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
||||||
Version_File=package/lean/default-settings/files/zzz-default-settings
|
Version_File=package/lean/default-settings/files/zzz-default-settings
|
||||||
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
|
||||||
|
zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
|
||||||
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
|
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
|
||||||
;;
|
;;
|
||||||
immortalwrt/immortalwrt)
|
immortalwrt/immortalwrt)
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,8 @@ df -h
|
||||||
echo "------------------------------- IP Address Info ------------------------------"
|
echo "------------------------------- IP Address Info ------------------------------"
|
||||||
IP=`curl ip.115115.xyz -s`
|
IP=`curl ip.115115.xyz -s`
|
||||||
curl ip.115115.xyz -s
|
curl ip.115115.xyz -s
|
||||||
curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
|
# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
|
||||||
|
curl -s https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
|
||||||
}
|
}
|
||||||
|
|
||||||
Get_Release_Info() {
|
Get_Release_Info() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue