fix ci config mutation
This commit is contained in:
parent
9769cda745
commit
5f897afd41
|
|
@ -188,16 +188,20 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
chmod +x Scripts/AutoBuild_*.sh
|
chmod +x Scripts/AutoBuild_*.sh
|
||||||
cd openwrt
|
cd openwrt
|
||||||
|
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
then
|
then
|
||||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
fi
|
fi
|
||||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||||
make defconfig
|
make defconfig
|
||||||
Firmware_Diy_Before
|
Firmware_Diy_Before
|
||||||
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
|
then
|
||||||
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
|
fi
|
||||||
Firmware_Diy_Main
|
Firmware_Diy_Main
|
||||||
Firmware_Diy
|
Firmware_Diy
|
||||||
Firmware_Diy_Other
|
Firmware_Diy_Other
|
||||||
|
|
|
||||||
|
|
@ -185,16 +185,20 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
chmod +x Scripts/AutoBuild_*.sh
|
chmod +x Scripts/AutoBuild_*.sh
|
||||||
cd openwrt
|
cd openwrt
|
||||||
|
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
then
|
then
|
||||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
fi
|
fi
|
||||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||||
make defconfig
|
make defconfig
|
||||||
Firmware_Diy_Before
|
Firmware_Diy_Before
|
||||||
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
|
then
|
||||||
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
|
fi
|
||||||
Firmware_Diy_Main
|
Firmware_Diy_Main
|
||||||
Firmware_Diy
|
Firmware_Diy
|
||||||
Firmware_Diy_Other
|
Firmware_Diy_Other
|
||||||
|
|
|
||||||
|
|
@ -184,16 +184,20 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
chmod +x Scripts/AutoBuild_*.sh
|
chmod +x Scripts/AutoBuild_*.sh
|
||||||
cd openwrt
|
cd openwrt
|
||||||
|
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
then
|
then
|
||||||
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
fi
|
fi
|
||||||
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
|
||||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||||
make defconfig
|
make defconfig
|
||||||
Firmware_Diy_Before
|
Firmware_Diy_Before
|
||||||
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||||
|
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
|
||||||
|
then
|
||||||
|
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> .config
|
||||||
|
fi
|
||||||
Firmware_Diy_Main
|
Firmware_Diy_Main
|
||||||
Firmware_Diy
|
Firmware_Diy
|
||||||
Firmware_Diy_Other
|
Firmware_Diy_Other
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
# AI Modification Log: CI Config Mutation
|
||||||
|
|
||||||
|
Date: 2026-06-29
|
||||||
|
|
||||||
|
## Change
|
||||||
|
|
||||||
|
- Updated X/Y/Z `Run Diy Scripts` steps so CI-only `CONFIG_DEVEL` and `CONFIG_CCACHE` settings are appended to `openwrt/.config` instead of `$GITHUB_WORKSPACE/Configs/$CONFIG_FILE`.
|
||||||
|
- Re-applied those CI-only settings after `.config` is regenerated before `Firmware_Diy_Main`.
|
||||||
|
|
||||||
|
## Reason
|
||||||
|
|
||||||
|
The workflow previously mutated tracked config files during CI runs. Writing CI-only options to `.config` keeps repository configs clean while preserving the intended build-time ccache/devel settings.
|
||||||
Loading…
Reference in New Issue