Skip to content

Commit af31ddb

Browse files
fix(ci): use absolute paths for config fragments in merge step
merge_config.sh runs from kernel/src/ so relative paths like configs/base/x86-64-v2.config resolve against the wrong directory. Capture REPO_ROOT before cd and prefix all fragment paths.
1 parent b481f7f commit af31ddb

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,19 @@ jobs:
107107

108108
- name: Merge config fragments
109109
run: |
110-
MERGE="${PWD}/kernel/src/scripts/kconfig/merge_config.sh"
111-
FRAGS=(configs/base/x86-64-v2.config)
110+
REPO_ROOT="${PWD}"
111+
MERGE="${REPO_ROOT}/kernel/src/scripts/kconfig/merge_config.sh"
112+
FRAGS=("${REPO_ROOT}/configs/base/x86-64-v2.config")
112113
case "${{ matrix.mode }}" in
113-
xanmod) FRAGS+=(configs/features/xanmod.config) ;;
114-
liquorix) FRAGS+=(configs/features/liquorix.config) ;;
114+
xanmod) FRAGS+=("${REPO_ROOT}/configs/features/xanmod.config") ;;
115+
liquorix) FRAGS+=("${REPO_ROOT}/configs/features/liquorix.config") ;;
115116
hybrid|auto)
116-
FRAGS+=(configs/features/xanmod.config)
117-
FRAGS+=(configs/features/liquorix.config)
118-
FRAGS+=(configs/features/hybrid.config)
117+
FRAGS+=("${REPO_ROOT}/configs/features/xanmod.config")
118+
FRAGS+=("${REPO_ROOT}/configs/features/liquorix.config")
119+
FRAGS+=("${REPO_ROOT}/configs/features/hybrid.config")
119120
;;
120121
esac
121-
FRAGS+=(configs/features/no-debug.config)
122+
FRAGS+=("${REPO_ROOT}/configs/features/no-debug.config")
122123
cd kernel/src
123124
bash "${MERGE}" -m .config "${FRAGS[@]}"
124125
make ARCH=x86 olddefconfig

0 commit comments

Comments
 (0)