Compare commits

..

No commits in common. "c43892ad94624bbe996c71066d768128401cf08b" and "696b8de1e8273ab45581119461dc11e9377612f8" have entirely different histories.

6 changed files with 6 additions and 9 deletions

View File

@ -72,6 +72,7 @@ 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

View File

@ -149,6 +149,7 @@ 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

View File

@ -147,6 +147,7 @@ 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
@ -247,7 +248,6 @@ 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,7 +392,6 @@ 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

View File

@ -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*
;; ;;

View File

@ -23,11 +23,8 @@ 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
Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION) zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
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)

View File

@ -17,8 +17,7 @@ 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() {