From 75c37ad965d8e6f9fe29a58b0727e4d7bd26f0b8 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 12:35:42 -0500 Subject: [PATCH 1/8] Add verbose output for submods step --- .github/workflows/rocprofiler-sdk-continuous_integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index a3930052f34..73f016969bf 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -120,6 +120,7 @@ jobs: id: submods shell: bash run: | + set -v git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" From 2e215e34a3dac59d1ffb124e497c4c5a7112790f Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 12:47:55 -0500 Subject: [PATCH 2/8] Remove git config setting --- .github/workflows/rocprofiler-sdk-continuous_integration.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index 73f016969bf..fb51bc365bb 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -121,7 +121,6 @@ jobs: shell: bash run: | set -v - git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" # collect submodule paths for cache 'path' From bf69c3c528164a9391e0184056478d33cf96bb29 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 13:00:55 -0500 Subject: [PATCH 3/8] Determine git version --- .github/workflows/rocprofiler-sdk-continuous_integration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index fb51bc365bb..b49b77f320c 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -121,6 +121,9 @@ jobs: shell: bash run: | set -v + which git + git --version + git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" # collect submodule paths for cache 'path' From cb460d61acea20d19a4e6976a94765ddb9b4e359 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 13:16:24 -0500 Subject: [PATCH 4/8] Try different git install --- .../workflows/rocprofiler-sdk-continuous_integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index b49b77f320c..0e2a1dc9b09 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -122,12 +122,12 @@ jobs: run: | set -v which git - git --version - git config --global --add safe.directory '*' - git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status + /usr/local/bin/git --version + /usr/local/bin/git config --global --add safe.directory '*' + /usr/local/bin/git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" # collect submodule paths for cache 'path' - git config --file .gitmodules --get-regexp path | awk '{print $2}' > .git-submodule-paths + /usr/local/bin/git config --file .gitmodules --get-regexp path | awk '{print $2}' > .git-submodule-paths { echo "paths<> "$GITHUB_OUTPUT" - name: Restore submodule cache From 597c41def8c474471bd04c86b61a9c7a07ba24fc Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 14:55:32 -0500 Subject: [PATCH 5/8] Update Dockerfile.ci --- projects/rocprofiler-sdk/docker/Dockerfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/rocprofiler-sdk/docker/Dockerfile.ci b/projects/rocprofiler-sdk/docker/Dockerfile.ci index 1cebccae3be..ad2fcff0672 100644 --- a/projects/rocprofiler-sdk/docker/Dockerfile.ci +++ b/projects/rocprofiler-sdk/docker/Dockerfile.ci @@ -21,7 +21,7 @@ ENV LD_LIBRARY_PATH=/opt/rocm/lib:/opt/rocm/llvm/lib:${LD_LIBRARY_PATH} RUN set-euo pipefail; \ if [ -f /etc/debian_version ]; then \ apt-get update && \ - apt-get install -y curl wget gpg python3 python3-pip build-essential coreutils software-properties-common git cmake g++-11 g++-12 libdw-dev libsqlite3-dev libdrm-dev file autoconf pkg-config rpm libzstd-dev && \ + apt-get install -y curl wget gpg python3 python3-pip build-essential coreutils software-properties-common cmake g++-11 g++-12 libdw-dev libsqlite3-dev libdrm-dev file autoconf pkg-config rpm libzstd-dev && \ add-apt-repository ppa:git-core/ppa && \ mkdir -p /etc/apt/keyrings && \ wget -N -P /tmp/ https://repo.radeon.com/amdgpu-install/latest/ubuntu/jammy/amdgpu-install_7.1.1.70101-1_all.deb && \ From a7e58198e0426298e5fda0a71bc392ec6cd62b12 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 14:58:05 -0500 Subject: [PATCH 6/8] Revert git location in Ubuntu jobs --- .../workflows/rocprofiler-sdk-continuous_integration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index 0e2a1dc9b09..b49b77f320c 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -122,12 +122,12 @@ jobs: run: | set -v which git - /usr/local/bin/git --version - /usr/local/bin/git config --global --add safe.directory '*' - /usr/local/bin/git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status + git --version + git config --global --add safe.directory '*' + git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" # collect submodule paths for cache 'path' - /usr/local/bin/git config --file .gitmodules --get-regexp path | awk '{print $2}' > .git-submodule-paths + git config --file .gitmodules --get-regexp path | awk '{print $2}' > .git-submodule-paths { echo "paths<> "$GITHUB_OUTPUT" - name: Restore submodule cache From 27a1945682761b1a411dccaf9bc6e113b284c5b8 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 15:04:15 -0500 Subject: [PATCH 7/8] Update RHEL and SLES sections to use 2.52 as well --- projects/rocprofiler-sdk/docker/Dockerfile.ci | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/rocprofiler-sdk/docker/Dockerfile.ci b/projects/rocprofiler-sdk/docker/Dockerfile.ci index ad2fcff0672..2e87ce9d6d3 100644 --- a/projects/rocprofiler-sdk/docker/Dockerfile.ci +++ b/projects/rocprofiler-sdk/docker/Dockerfile.ci @@ -38,16 +38,16 @@ RUN set -euo pipefail; \ dnf clean all || true; \ dnf install -y perl-ExtUtils-MakeMaker python3-pip || true; \ if [ $(grep -i "VERSION_ID=\"8.8\"" /etc/os-release | wc -l) -gt 0 ]; then \ - wget https://www.kernel.org/pub/software/scm/git/git-2.51.0.tar.xz; \ - tar -xf git-2.51.0.tar.xz; \ - cd git-2.51.0; \ + wget https://www.kernel.org/pub/software/scm/git/git-2.52.0.tar.xz; \ + tar -xf git-2.52.0.tar.xz; \ + cd git-2.52.0; \ rm -rf /etc/yum.repos.d/redhat-partner.repo || true; \ dnf clean all; \ dnf install -y perl-ExtUtils-MakeMaker || true; \ export PATH=/opt/rh/gcc-toolset-11/root/usr/bin:$PATH; \ make prefix=/usr all -j 32; \ make prefix=/usr install; \ - cd ..; rm -rf git-2.51.0*; \ + cd ..; rm -rf git-2.52.0*; \ echo -e "[ROCm-latest]\nname=ROCm\nbaseurl=https://repo.radeon.com/rocm/el8/latest/main\nenabled=1\npriority=50\ngpgcheck=1\ngpgkey=https://repo.radeon.com/rocm/rocm.gpg.key" > /etc/yum.repos.d/rocm.repo; \ echo -e "[amdgpu]\nname=amdgpu\nbaseurl=https://repo.radeon.com/amdgpu/latest/rhel/8.10/main/x86_64/\nenabled=1\npriority=50\ngpgcheck=1\ngpgkey=https://repo.radeon.com/rocm/rocm.gpg.key" > /etc/yum.repos.d/amdgpu.repo; \ else \ @@ -81,9 +81,9 @@ RUN set -euo pipefail; \ source ~/.bashrc; \ python3 -m pip install --upgrade pip || true; \ python3 -m pip install --upgrade -r /root/requirements.txt || true; \ - cd /tmp; wget https://www.kernel.org/pub/software/scm/git/git-2.51.0.tar.xz; \ - tar -xf git-2.51.0.tar.xz; cd git-2.51.0; make prefix=/usr all -j 32; make prefix=/usr install; \ - cd /tmp; ln -s -f /usr/bin/git /usr/local/bin/git; rm -rf git-2.51.0*; \ + cd /tmp; wget https://www.kernel.org/pub/software/scm/git/git-2.0.tar.xz; \ + tar -xf git-2.52.0.tar.xz; cd git-2.52.0; make prefix=/usr all -j 32; make prefix=/usr install; \ + cd /tmp; ln -s -f /usr/bin/git /usr/local/bin/git; rm -rf git-2.52.0*; \ fi; # Nightly Tarball From fb20e72f36a83d995bd005d2ac778c085563bcb8 Mon Sep 17 00:00:00 2001 From: jbonnell-amd Date: Thu, 8 Jan 2026 15:30:51 -0500 Subject: [PATCH 8/8] Add git --version to each step, fix typo in SLES Docker --- .github/workflows/rocprofiler-sdk-continuous_integration.yml | 4 ++-- projects/rocprofiler-sdk/docker/Dockerfile.ci | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rocprofiler-sdk-continuous_integration.yml b/.github/workflows/rocprofiler-sdk-continuous_integration.yml index b49b77f320c..573395f021c 100644 --- a/.github/workflows/rocprofiler-sdk-continuous_integration.yml +++ b/.github/workflows/rocprofiler-sdk-continuous_integration.yml @@ -120,8 +120,6 @@ jobs: id: submods shell: bash run: | - set -v - which git git --version git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status @@ -452,6 +450,7 @@ jobs: id: submods shell: bash run: | + git --version git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" @@ -696,6 +695,7 @@ jobs: id: submods shell: bash run: | + git --version git config --global --add safe.directory '*' git submodule status --recursive | awk '{print $1,$2}' > .git-submodules-status echo "hash=$(sha256sum .git-submodules-status | cut -d' ' -f1)" >> "$GITHUB_OUTPUT" diff --git a/projects/rocprofiler-sdk/docker/Dockerfile.ci b/projects/rocprofiler-sdk/docker/Dockerfile.ci index 2e87ce9d6d3..56ef2f15b3c 100644 --- a/projects/rocprofiler-sdk/docker/Dockerfile.ci +++ b/projects/rocprofiler-sdk/docker/Dockerfile.ci @@ -81,7 +81,7 @@ RUN set -euo pipefail; \ source ~/.bashrc; \ python3 -m pip install --upgrade pip || true; \ python3 -m pip install --upgrade -r /root/requirements.txt || true; \ - cd /tmp; wget https://www.kernel.org/pub/software/scm/git/git-2.0.tar.xz; \ + cd /tmp; wget https://www.kernel.org/pub/software/scm/git/git-2.52.0.tar.xz; \ tar -xf git-2.52.0.tar.xz; cd git-2.52.0; make prefix=/usr all -j 32; make prefix=/usr install; \ cd /tmp; ln -s -f /usr/bin/git /usr/local/bin/git; rm -rf git-2.52.0*; \ fi;