Skip to content

Commit 3229e73

Browse files
committed
Updates
Signed-off-by: yalmusaf <Yazen.ALMusaffar@amd.com>
1 parent 0a08eff commit 3229e73

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

.github/workflows/dme-amdsmi-ci.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,17 @@ jobs:
157157
# Disable the private libgimsmi submodule
158158
git -C "$DME_DIR" config submodule.libgimsmi.update none || true
159159
160-
# Rewrite SSH → HTTPS for CI (containers lack SSH host keys)
161-
git config --global url."https://github.com/".insteadOf "git@github.com:"
162-
git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
160+
# Init top-level required submodules first
161+
git -C "$DME_DIR" submodule update --init --depth 1 -- gpuagent libamdsmi
163162
164-
# Init only the submodules we need
165-
git -C "$DME_DIR" submodule update --init --recursive --depth 1 \
166-
-- gpuagent libamdsmi
163+
# Override gpuagent nested third-party submodules to HTTPS (repo-local)
164+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/abseil-cpp.url https://github.com/abseil/abseil-cpp.git || true
165+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/boost_1_88_0.url https://github.com/boostorg/boost.git || true
166+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/libzmq.url https://github.com/zeromq/libzmq.git || true
167+
168+
# Sync and fetch nested submodules after URL override
169+
git -C "$DME_DIR/gpuagent" submodule sync --recursive
170+
git -C "$DME_DIR/gpuagent" submodule update --init --recursive --depth 1
167171
168172
# Overlay this repo's AMDSMI source onto DME's libamdsmi submodule
169173
AMDSMI_SRC="$GITHUB_WORKSPACE/projects/amdsmi"
@@ -575,13 +579,17 @@ jobs:
575579
# Disable the private libgimsmi submodule
576580
git -C "$DME_DIR" config submodule.libgimsmi.update none || true
577581
578-
# Rewrite SSH → HTTPS for CI (containers lack SSH host keys)
579-
git config --global url."https://github.com/".insteadOf "git@github.com:"
580-
git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
582+
# Init top-level required submodules first
583+
git -C "$DME_DIR" submodule update --init --depth 1 -- gpuagent libamdsmi
584+
585+
# Override gpuagent nested third-party submodules to HTTPS (repo-local)
586+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/abseil-cpp.url https://github.com/abseil/abseil-cpp.git || true
587+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/boost_1_88_0.url https://github.com/boostorg/boost.git || true
588+
git -C "$DME_DIR/gpuagent" config submodule.sw/nic/third-party/libzmq.url https://github.com/zeromq/libzmq.git || true
581589
582-
# Init only the submodules we need
583-
git -C "$DME_DIR" submodule update --init --recursive --depth 1 \
584-
-- gpuagent libamdsmi
590+
# Sync and fetch nested submodules after URL override
591+
git -C "$DME_DIR/gpuagent" submodule sync --recursive
592+
git -C "$DME_DIR/gpuagent" submodule update --init --recursive --depth 1
585593
586594
# Overlay this repo's AMDSMI source onto DME's libamdsmi submodule
587595
AMDSMI_SRC="$GITHUB_WORKSPACE/projects/amdsmi"

0 commit comments

Comments
 (0)