From 5f897afd413674c2771951e23aa8bbe30ddae5e8 Mon Sep 17 00:00:00 2001 From: xopenwrt Date: Mon, 29 Jun 2026 21:22:47 +0800 Subject: [PATCH] fix ci config mutation --- .github/workflows/X-x86_64_X.yml | 8 ++++++-- .github/workflows/X-x86_64_Y.yml | 8 ++++++-- .github/workflows/X-x86_64_Z.yml | 8 ++++++-- AI_CHANGELOG_CI_CONFIG_MUTATION.md | 12 ++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 AI_CHANGELOG_CI_CONFIG_MUTATION.md diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml index 5409602..2f9d91f 100644 --- a/.github/workflows/X-x86_64_X.yml +++ b/.github/workflows/X-x86_64_X.yml @@ -188,16 +188,20 @@ jobs: run: | chmod +x Scripts/AutoBuild_*.sh cd openwrt + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config if [ "${{ env.CACHE_ACCELERATE }}" == true ] 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 - cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh make defconfig Firmware_Diy_Before 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 Firmware_Diy_Other diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml index c271961..c1a4f84 100644 --- a/.github/workflows/X-x86_64_Y.yml +++ b/.github/workflows/X-x86_64_Y.yml @@ -185,16 +185,20 @@ jobs: run: | chmod +x Scripts/AutoBuild_*.sh cd openwrt + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config if [ "${{ env.CACHE_ACCELERATE }}" == true ] 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 - cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh make defconfig Firmware_Diy_Before 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 Firmware_Diy_Other diff --git a/.github/workflows/X-x86_64_Z.yml b/.github/workflows/X-x86_64_Z.yml index 06f1876..114920e 100644 --- a/.github/workflows/X-x86_64_Z.yml +++ b/.github/workflows/X-x86_64_Z.yml @@ -184,16 +184,20 @@ jobs: run: | chmod +x Scripts/AutoBuild_*.sh cd openwrt + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config if [ "${{ env.CACHE_ACCELERATE }}" == true ] 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 - cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh make defconfig Firmware_Diy_Before 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 Firmware_Diy_Other diff --git a/AI_CHANGELOG_CI_CONFIG_MUTATION.md b/AI_CHANGELOG_CI_CONFIG_MUTATION.md new file mode 100644 index 0000000..f410c8b --- /dev/null +++ b/AI_CHANGELOG_CI_CONFIG_MUTATION.md @@ -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.