From f5980141e083c36536a892d91baadf82ec3c4e4b Mon Sep 17 00:00:00 2001 From: therockbot Date: Wed, 3 Jun 2026 12:59:52 +0000 Subject: [PATCH 1/4] Update TheRock ref to 84b3ab1 --- .github/workflows/therock-ci-linux.yml | 2 +- .github/workflows/therock-ci-nightly.yml | 2 +- .github/workflows/therock-ci-windows.yml | 2 +- .github/workflows/therock-ci.yml | 2 +- .github/workflows/therock-test-component.yml | 2 +- .github/workflows/therock-test-packages.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml index 0948b1e4ee59..e910b11d8406 100644 --- a/.github/workflows/therock-ci-linux.yml +++ b/.github/workflows/therock-ci-linux.yml @@ -54,7 +54,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: ${{ inputs.therock_ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Install python deps run: | diff --git a/.github/workflows/therock-ci-nightly.yml b/.github/workflows/therock-ci-nightly.yml index f7e7411f7878..10350cb12ceb 100644 --- a/.github/workflows/therock-ci-nightly.yml +++ b/.github/workflows/therock-ci-nightly.yml @@ -44,7 +44,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: ${{ steps.ci-env.outputs.therock-ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml index 7496fb3fc2ad..9b4744f69f2a 100644 --- a/.github/workflows/therock-ci-windows.yml +++ b/.github/workflows/therock-ci-windows.yml @@ -55,7 +55,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" - ref: ${{ inputs.therock_ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-ci.yml b/.github/workflows/therock-ci.yml index 53a935397edc..27e7756ee4b3 100644 --- a/.github/workflows/therock-ci.yml +++ b/.github/workflows/therock-ci.yml @@ -72,7 +72,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: ${{ steps.ci-env.outputs.therock-ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-test-component.yml b/.github/workflows/therock-test-component.yml index e7c8b85e45c8..3e664b542ce9 100644 --- a/.github/workflows/therock-test-component.yml +++ b/.github/workflows/therock-test-component.yml @@ -77,7 +77,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: "ROCm/TheRock" - ref: ${{ inputs.therock_ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Configure git for long paths on Windows if: ${{ runner.os == 'Windows' }} diff --git a/.github/workflows/therock-test-packages.yml b/.github/workflows/therock-test-packages.yml index 78c80080df5c..1094e2a1cc72 100644 --- a/.github/workflows/therock-test-packages.yml +++ b/.github/workflows/therock-test-packages.yml @@ -46,7 +46,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: "ROCm/TheRock" - ref: ${{ inputs.therock_ref }} + ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit - name: Setting up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 From 62edcb4e79ecc986495e0652933c64199924ff72 Mon Sep 17 00:00:00 2001 From: archana-ramalingam Date: Thu, 4 Jun 2026 18:04:18 +0000 Subject: [PATCH 2/4] Restore workflow TheRock ref expressions and update ci-env The bump automation bot incorrectly hardcoded the TheRock SHA in 6 workflow files instead of only updating ci-env/action.yml. This restores the original ${{ inputs.therock_ref }} and ${{ steps.ci-env.outputs.therock-ref }} expressions and updates ci-env/action.yml to the new ref. Co-Authored-By: Claude Opus 4.6 --- .github/actions/ci-env/action.yml | 2 +- .github/workflows/therock-ci-linux.yml | 2 +- .github/workflows/therock-ci-nightly.yml | 2 +- .github/workflows/therock-ci-windows.yml | 2 +- .github/workflows/therock-ci.yml | 2 +- .github/workflows/therock-test-component.yml | 2 +- .github/workflows/therock-test-packages.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/ci-env/action.yml b/.github/actions/ci-env/action.yml index e2557746306d..ecc78976a076 100644 --- a/.github/actions/ci-env/action.yml +++ b/.github/actions/ci-env/action.yml @@ -4,7 +4,7 @@ description: "Single source of truth for shared CI constants (TheRock ref, Docke outputs: therock-ref: description: "TheRock commit hash to use" - value: "685f8c3b89006309b34a7c16de17e841400f0d76" # 2026-05-29 commit + value: "84b3ab155f3faf64c5f7f783a7a35f315e0969c7" # 2026-06-03 commit docker-image: description: "Docker container image for Linux builds" value: "ghcr.io/rocm/therock_build_manylinux_x86_64@sha256:48492540591673fdc8d51beb89bde41e7ba13cbb528f643c0a481ba42c4058f2" diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml index e910b11d8406..0948b1e4ee59 100644 --- a/.github/workflows/therock-ci-linux.yml +++ b/.github/workflows/therock-ci-linux.yml @@ -54,7 +54,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ inputs.therock_ref }} - name: Install python deps run: | diff --git a/.github/workflows/therock-ci-nightly.yml b/.github/workflows/therock-ci-nightly.yml index 10350cb12ceb..f7e7411f7878 100644 --- a/.github/workflows/therock-ci-nightly.yml +++ b/.github/workflows/therock-ci-nightly.yml @@ -44,7 +44,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ steps.ci-env.outputs.therock-ref }} - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml index 9b4744f69f2a..7496fb3fc2ad 100644 --- a/.github/workflows/therock-ci-windows.yml +++ b/.github/workflows/therock-ci-windows.yml @@ -55,7 +55,7 @@ jobs: with: repository: "ROCm/TheRock" path: "TheRock" - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ inputs.therock_ref }} - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-ci.yml b/.github/workflows/therock-ci.yml index 27e7756ee4b3..53a935397edc 100644 --- a/.github/workflows/therock-ci.yml +++ b/.github/workflows/therock-ci.yml @@ -72,7 +72,7 @@ jobs: with: repository: "ROCm/TheRock" path: TheRock - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ steps.ci-env.outputs.therock-ref }} - name: Set up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 diff --git a/.github/workflows/therock-test-component.yml b/.github/workflows/therock-test-component.yml index 3e664b542ce9..e7c8b85e45c8 100644 --- a/.github/workflows/therock-test-component.yml +++ b/.github/workflows/therock-test-component.yml @@ -77,7 +77,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: "ROCm/TheRock" - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ inputs.therock_ref }} - name: Configure git for long paths on Windows if: ${{ runner.os == 'Windows' }} diff --git a/.github/workflows/therock-test-packages.yml b/.github/workflows/therock-test-packages.yml index 1094e2a1cc72..78c80080df5c 100644 --- a/.github/workflows/therock-test-packages.yml +++ b/.github/workflows/therock-test-packages.yml @@ -46,7 +46,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: repository: "ROCm/TheRock" - ref: 84b3ab155f3faf64c5f7f783a7a35f315e0969c7 # 2026-06-03 commit + ref: ${{ inputs.therock_ref }} - name: Setting up Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 From f580fdb64011e5830f05b46729b8b626d11a742e Mon Sep 17 00:00:00 2001 From: archana-ramalingam Date: Thu, 4 Jun 2026 18:28:09 +0000 Subject: [PATCH 3/4] Trigger CI on ci-env/action.yml changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The path filter in therock_configure_ci.py only checked .github/workflows/ and .github/scripts/ — changes to .github/actions/ci-env/ (the single source of truth for the TheRock ref) were not detected, causing CI to skip builds on TheRock ref bump PRs. Co-Authored-By: Claude Opus 4.6 --- .github/scripts/therock_configure_ci.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/scripts/therock_configure_ci.py b/.github/scripts/therock_configure_ci.py index d9e60c5f5110..916fb0b920db 100644 --- a/.github/scripts/therock_configure_ci.py +++ b/.github/scripts/therock_configure_ci.py @@ -198,14 +198,19 @@ def get_modified_paths(base_ref: str) -> Optional[Iterable[str]]: "therock*", ] +GITHUB_ACTIONS_CI_PATTERNS = [ + "ci-env/action.yml", +] + def is_path_workflow_file_related_to_ci(path: str) -> bool: return any( - fnmatch.fnmatch(path, ".github/workflows/" + pattern) + fnmatch.fnmatch(path, prefix + pattern) + for prefix in [".github/workflows/", ".github/scripts/"] for pattern in GITHUB_WORKFLOWS_CI_PATTERNS ) or any( - fnmatch.fnmatch(path, ".github/scripts/" + pattern) - for pattern in GITHUB_WORKFLOWS_CI_PATTERNS + fnmatch.fnmatch(path, ".github/actions/" + pattern) + for pattern in GITHUB_ACTIONS_CI_PATTERNS ) From 95482a8552a6525371f9bca1b6d5cb2f2af4afd1 Mon Sep 17 00:00:00 2001 From: Tony Davis Date: Fri, 5 Jun 2026 13:01:29 -0500 Subject: [PATCH 4/4] Update .github/actions/ci-env/action.yml --- .github/actions/ci-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ci-env/action.yml b/.github/actions/ci-env/action.yml index ecc78976a076..13ea91d4a6fb 100644 --- a/.github/actions/ci-env/action.yml +++ b/.github/actions/ci-env/action.yml @@ -4,7 +4,7 @@ description: "Single source of truth for shared CI constants (TheRock ref, Docke outputs: therock-ref: description: "TheRock commit hash to use" - value: "84b3ab155f3faf64c5f7f783a7a35f315e0969c7" # 2026-06-03 commit + value: "4be597ff149ea67c11b6036480f96d90f64365e1" # 2026-06-04 commit docker-image: description: "Docker container image for Linux builds" value: "ghcr.io/rocm/therock_build_manylinux_x86_64@sha256:48492540591673fdc8d51beb89bde41e7ba13cbb528f643c0a481ba42c4058f2"