From ccee268e28426f7f8631b11747f88a7a642a9618 Mon Sep 17 00:00:00 2001
From: Charlie Truong <chtruong@nvidia.com>
Date: Wed, 2 Apr 2025 23:25:59 -0500
Subject: [PATCH 1/3] ci: Fix unit test summary in GHA

Signed-off-by: Charlie Truong <chtruong@nvidia.com>
---
 .github/workflows/_run_test.yml | 3 +--
 .github/workflows/cicd-main.yml | 4 ++--
 docker/Dockerfile               | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/_run_test.yml b/.github/workflows/_run_test.yml
index 4e2131629a..89827efdad 100644
--- a/.github/workflows/_run_test.yml
+++ b/.github/workflows/_run_test.yml
@@ -81,7 +81,6 @@ jobs:
               --env HF_DATASETS_CACHE=/home/TestData/reinforcer/hf_datasets_cache \
               --env REINFORCER_REPO_DIR=/opt/reinforcer \
               --env HF_TOKEN \
-              --env GITHUB_STEP_SUMMARY \
               --volume $GITHUB_ACTION_DIR:$GITHUB_ACTION_DIR \
               --volume /mnt/datadrive/TestData/reinforcer/datasets:/opt/reinforcer/datasets:ro \
               --volume /mnt/datadrive/TestData/reinforcer/checkpoints:/home/TestData/reinforcer/checkpoints:ro \
@@ -112,7 +111,7 @@ jobs:
             ${{ inputs.AFTER_SCRIPT }}
             RUN_TEST_EOF
             )
-            docker exec nemo_container_${{ github.run_id }} bash -eux -o pipefail -c "$cmd"
+            docker exec --env GITHUB_STEP_SUMMARY nemo_container_${{ github.run_id }} bash -eux -o pipefail -c "$cmd"
 
         - name: final_script_external
           if: always() && inputs.FINAL_SCRIPT_EXTERNAL != ':'
diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 92e55f62cd..0bfc2aae9d 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -152,12 +152,12 @@ jobs:
         # uv run --no-sync bash ./tests/functional/grpo.sh
       AFTER_SCRIPT: |
         cd /opt/reinforcer
-        cat <<EOF
+        cat <<EOF | tee -a $GITHUB_STEP_SUMMARY
         # Unit test results
         \`\`\`json
         $(cat tests/unit/unit_results.json || echo "n/a")
         \`\`\`
-        EOF | tee -a $GITHUB_STEP_SUMMARY
+        EOF
     secrets:
       HF_TOKEN: ${{ secrets.HF_TOKEN }}
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 65e4ae4a6c..516b9b78d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,6 +47,6 @@ sed -i '/export PATH=\$HOME\/anaconda3\/bin:\$PATH/ s/^/# /' ~/.bashrc
 EOF
 
 COPY --from=deps --chown=ray --chmod=755 /opt/reinforcer/.venv /opt/reinforcer/.venv
-COPY --chown=ray --chmod=755 .git /opt/reinforcer/.git
 COPY --chown=ray --chmod=755 . /opt/reinforcer
-RUN uv pip install --no-deps --editable .
+RUN git config --global --add safe.directory /opt/reinforcer && \
+    uv pip install --no-deps --editable .

From 07248068003b6cb18d7176ba8dff56f40a524227 Mon Sep 17 00:00:00 2001
From: Charlie Truong <chtruong@nvidia.com>
Date: Fri, 4 Apr 2025 12:04:17 -0500
Subject: [PATCH 2/3] Add DCO placeholder check for merge queue

Signed-off-by: Charlie Truong <chtruong@nvidia.com>
---
 .github/workflows/cicd-main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 0bfc2aae9d..0c46a55f16 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -182,3 +182,10 @@ jobs:
           echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
 
           test "$ALL_SUCCESS" = "true" || test "$CI_SKIP" = "true"
+
+  DCO_merge_group:
+    name: DCO
+    if: github.event_name == 'merge_group'
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "The actual DCO check happens on PRs only. This is a placeholder for the merge queue to keep the DCO check as a required status check."

From ddf6f80db39f141987c41973049bb8c77e01adda Mon Sep 17 00:00:00 2001
From: Charlie Truong <chtruong@nvidia.com>
Date: Fri, 4 Apr 2025 12:23:01 -0500
Subject: [PATCH 3/3] Revert "Add DCO placeholder check for merge queue"

This reverts commit 07248068003b6cb18d7176ba8dff56f40a524227.

Signed-off-by: Charlie Truong <chtruong@nvidia.com>
---
 .github/workflows/cicd-main.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 0c46a55f16..0bfc2aae9d 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -182,10 +182,3 @@ jobs:
           echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
 
           test "$ALL_SUCCESS" = "true" || test "$CI_SKIP" = "true"
-
-  DCO_merge_group:
-    name: DCO
-    if: github.event_name == 'merge_group'
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "The actual DCO check happens on PRs only. This is a placeholder for the merge queue to keep the DCO check as a required status check."