Skip to content

Commit ed2c986

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

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

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

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ jobs:
151151
set -eu
152152
rm -rf "$DME_DIR"
153153
154+
# Force all git@github.com: URLs to use HTTPS instead (global, affects all submodules)
155+
git config --global url."https://github.com/".insteadOf "git@github.com:"
156+
154157
# Clone WITHOUT recurse-submodules (libgimsmi is private/SSH-only)
155158
GIT_TERMINAL_PROMPT=0 git clone --depth 1 "$DME_REPO" "$DME_DIR"
156159
@@ -160,13 +163,16 @@ jobs:
160163
# Init top-level required submodules first
161164
git -C "$DME_DIR" submodule update --init --depth 1 -- gpuagent libamdsmi
162165
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
166+
# Also rewrite SSH→HTTPS in gpuagent's .gitmodules so sync propagates correctly
167+
# Use submodule NAMES (not paths) — "boost" is the name, "boost_1_88_0" is the path
168+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/abseil-cpp.url https://github.com/abseil/abseil-cpp.git || true
169+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/boost.url https://github.com/boostorg/boost.git || true
170+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/libzmq.url https://github.com/zeromq/libzmq.git || true
167171
168-
# Sync and fetch nested submodules after URL override
172+
# Sync propagates .gitmodules URLs → .git/config (now all HTTPS)
169173
git -C "$DME_DIR/gpuagent" submodule sync --recursive
174+
175+
# Now clone nested submodules with the correct HTTPS URLs
170176
git -C "$DME_DIR/gpuagent" submodule update --init --recursive --depth 1
171177
172178
# Overlay this repo's AMDSMI source onto DME's libamdsmi submodule
@@ -573,6 +579,9 @@ jobs:
573579
set -eu
574580
rm -rf "$DME_DIR"
575581
582+
# Force all git@github.com: URLs to use HTTPS instead (global, affects all submodules)
583+
git config --global url."https://github.com/".insteadOf "git@github.com:"
584+
576585
# Clone WITHOUT recurse-submodules (libgimsmi is private/SSH-only)
577586
GIT_TERMINAL_PROMPT=0 git clone --depth 1 "$DME_REPO" "$DME_DIR"
578587
@@ -582,13 +591,16 @@ jobs:
582591
# Init top-level required submodules first
583592
git -C "$DME_DIR" submodule update --init --depth 1 -- gpuagent libamdsmi
584593
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
594+
# Also rewrite SSH→HTTPS in gpuagent's .gitmodules so sync propagates correctly
595+
# Use submodule NAMES (not paths) — "boost" is the name, "boost_1_88_0" is the path
596+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/abseil-cpp.url https://github.com/abseil/abseil-cpp.git || true
597+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/boost.url https://github.com/boostorg/boost.git || true
598+
git -C "$DME_DIR/gpuagent" config -f .gitmodules submodule.sw/nic/third-party/libzmq.url https://github.com/zeromq/libzmq.git || true
589599
590-
# Sync and fetch nested submodules after URL override
600+
# Sync propagates .gitmodules URLs → .git/config (now all HTTPS)
591601
git -C "$DME_DIR/gpuagent" submodule sync --recursive
602+
603+
# Now clone nested submodules with the correct HTTPS URLs
592604
git -C "$DME_DIR/gpuagent" submodule update --init --recursive --depth 1
593605
594606
# Overlay this repo's AMDSMI source onto DME's libamdsmi submodule
@@ -892,4 +904,4 @@ jobs:
892904
zypper) zypper remove -y amd-metrics-exporter gpuagent amdgpu-exporter 2>/dev/null || true ;;
893905
dnf) dnf remove -y amd-metrics-exporter gpuagent amdgpu-exporter 2>/dev/null || true ;;
894906
esac
895-
rm -rf "$DME_DIR" /tmp/test-results /tmp/*.log
907+
rm -rf "$DME_DIR" /tmp/test-results /tmp/*.log

0 commit comments

Comments
 (0)