Skip to content

[ci] bump TheRock hash to 974db70 (2026-05-18) - #7582

Merged
kailash-khalasi merged 4 commits into
developfrom
users/kkhalasi/bump-therock-hash-974db70
May 26, 2026
Merged

kailash-khalasi merged 4 commits into
developfrom
users/kkhalasi/bump-therock-hash-974db70

Conversation

@kailash-khalasi

Copy link
Copy Markdown
Contributor

Bumping TheRock hash to 974db7092f493a7ffbcffaa393ca66d67d12bd13 (2026-05-18).

This includes ROCm/TheRock#5318 — increasing AWS runner weight from 10% to 20%.

Bumping TheRock hash to `974db7092f493a7ffbcffaa393ca66d67d12bd13` (2026-05-18).

This includes ROCm/TheRock#5318 — increasing AWS runner weight from 10% to 20%.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@kailash-khalasi
kailash-khalasi requested a review from a team as a code owner May 19, 2026 17:33
@github-actions github-actions Bot added github actions project: none Does not target any component labels May 19, 2026

@geomin12 geomin12 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@kailash-khalasi
kailash-khalasi merged commit d23f097 into develop May 26, 2026
10 checks passed
@kailash-khalasi
kailash-khalasi deleted the users/kkhalasi/bump-therock-hash-974db70 branch May 26, 2026 14:43

@ScottTodd ScottTodd left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please test and review these PRs more carefully.

need to update here: https://github.com/ROCm/rocm-libraries/blob/develop/.github/actions/ci-env/action.yml

That did not work since #7626 reverted parts of #7262

CI also did not even run on this PR, see https://github.com/ROCm/rocm-libraries/actions/runs/26409323996/job/77740042635#step:8:15

amd-justchen added a commit that referenced this pull request May 28, 2026
This restores the single-source-of-truth model from #7262 that was
partially reverted by #7626. It also closes the remaining gap from #7262
by routing the reusable test workflows through the centralized
`therock_ref` path, while preserving the intended TheRock ref at
`e44b42bbcc7452328ccf12bcac319bda5ede4a6a` (2026-05-20).

- **Centralize the current TheRock ref**
- Update `.github/actions/ci-env/action.yml` to hold the current TheRock
commit.
  - Make `ci-env` the only literal TheRock SHA under `.github/`.

- **Remove hardcoded refs from top-level TheRock workflows**
- Restore `therock-ci.yml` and `therock-ci-nightly.yml` to read the ref
from `steps.ci-env.outputs.therock-ref`.
- Restore `therock-ci-linux.yml` and `therock-ci-windows.yml` to use
their existing `inputs.therock_ref` instead of hardcoded SHAs.

- **Close the missed reusable-workflow gap**
  - Add required `therock_ref` inputs to:
    - `.github/workflows/therock-test-packages.yml`
    - `.github/workflows/therock-test-component.yml`
- Replace their hardcoded TheRock checkout refs with `${{
inputs.therock_ref }}`.

- **Thread `therock_ref` through the reusable workflow chain**
- Pass `therock_ref` from `therock-ci-linux.yml` /
`therock-ci-windows.yml` into `therock-test-packages.yml`.
- Pass `therock_ref` from `therock-test-packages.yml` into
`therock-test-component.yml`.

Example of the restored pattern:

```yaml
- name: Load CI environment
  id: ci-env
  uses: ./.github/actions/ci-env

- name: Checkout TheRock repository
  uses: actions/checkout@...
  with:
    repository: "ROCm/TheRock"
    ref: ${{ steps.ci-env.outputs.therock-ref }}
```

<!-- START COPILOT ORIGINAL PROMPT -->



<details>

<summary>Original prompt</summary>

## Background

PR [#7262](#7262) introduced
`.github/actions/ci-env/action.yml` as the single source of truth for
shared CI constants (TheRock commit ref, Docker image, runner labels).
All TheRock workflows were supposed to read the TheRock ref from
`ci-env` instead of hardcoding it.

Two follow-up bumps highlighted gaps:

- PR [#7582](#7582) correctly
bumped the ref by editing only `.github/actions/ci-env/action.yml` (one
file). This is the intended workflow.
- PR [#7626](#7626) ("Update
TheRock reference to e44b42b") regressed this. It hardcoded
`e44b42bbcc7452328ccf12bcac319bda5ede4a6a # 2026-05-20 commit` directly
into six workflow files, effectively reverting the centralization for
those files.

Scott Todd called this out on #7626:
> "Why was this merged? This reverted the changes from
#7262 by @KKyang (cc
@geomin12)"
([review
comment](#7626 (comment)))

Additionally, two workflow files were **never** centralized as part of
#7262 — they still contained a hardcoded TheRock ref even before #7626:
- `.github/workflows/therock-test-component.yml`
- `.github/workflows/therock-test-packages.yml`

These are reusable workflows invoked transitively from
`therock-ci-linux.yml` / `therock-ci-windows.yml`, so the `therock_ref`
input needs to be threaded through them.

## Goal

Fully implement the intent of #7262 by:

1. Updating `.github/actions/ci-env/action.yml` so it holds the current
ref (`e44b42bbcc7452328ccf12bcac319bda5ede4a6a` from 2026-05-20). This
preserves the actual ref that #7626 wanted to land.
2. Removing all the hardcoded TheRock refs reintroduced by #7626 and
routing them back through `ci-env`.
3. Closing the gaps left over from #7262 by also routing
`therock-test-component.yml` and `therock-test-packages.yml` through
`ci-env`.

After this PR, there should be **exactly one** literal occurrence of a
TheRock commit SHA under `.github/`, and it should live in
`.github/actions/ci-env/action.yml`.

## Required changes

Base this PR on the current `develop` branch.

### 1. `.github/actions/ci-env/action.yml`

Set the `therock-ref` output value to the 2026-05-20 commit:

```yaml
outputs:
  therock-ref:
    description: "TheRock commit hash to use"
    value: "e44b42bbcc7452328ccf12bcac319bda5ede4a6a" # 2026-05-20
```

(Leave `docker-image`, `linux-runner`, `windows-runner` untouched.)

### 2. `.github/workflows/therock-ci.yml`

The `setup` job's "Checkout TheRock repository" step currently has:
```yaml
ref: e44b42bbcc7452328ccf12bcac319bda5ede4a6a # 2026-05-20 commit
```
Restore it to:
```yaml
ref: ${{ steps.ci-env.outputs.therock-ref }}
```
(This was the form merged in #7262 and reverted by #7626.)

### 3. `.github/workflows/therock-ci-nightly.yml`

Same fix as `therock-ci.yml` — the `setup` job's "Checkout TheRock
repository" step must use `${{ steps.ci-env.outputs.therock-ref }}`
instead of the hardcoded `e44b42b...` SHA.

### 4. `.github/workflows/therock-ci-linux.yml`

The build job's "Checkout TheRock repository" step currently has:
```yaml
ref: e44b42bbcc7452328ccf12bcac319bda5ede4a6a # 2026-05-20 commit
```
Restore it to:
```yaml
ref: ${{ inputs.therock_ref }}
```
The `therock_ref` workflow input is already declared at the top of this
file — just use it.

### 5. `.github/workflows/therock-ci-windows.yml`

Same fix as `therock-ci-linux.yml`: change the hardcoded `ref:` in the
"Checkout TheRock repository" step to `${{ inputs.therock_ref }}`. The
input is already declared.

### 6. `.github/workflows/therock-test-packages.yml` (gap from #7262)

This reusable workflow has a hardcoded ref on the "Checking out
repository" step:
```yaml
ref: e44b42bbcc7452328ccf12bcac319bda5ede4a6a # 2026-05-20 commit
```

Changes:
- Add a new required `therock_ref` string input to
`on.workflow_call.inputs` (alongside the existing `projects_to_test`,
`amdgpu_families`, `test_runs_on`, `platform`, `test_type`).
- Replace the hardcoded `ref:` with `${{ inputs.therock_ref }}`.
- When this workflow calls
`./.github/workflows/therock-test-component.yml`, pass `therock_ref: ${{
inputs.therock_ref }}` through in the `with:` block.

### 7. `.github/workflows/therock-test-component.yml` (gap from #7262)

This reusable workflow has a hardcoded ref on its "Checkout Repository"
step:
```yaml
ref: e44b42bbcc7452328ccf12bcac319bda5ede4a6a # 2026-05-20 commit
```

Changes:
- Add a new required `therock_ref` string input to
`on.workflow_call.inputs`.
- Replace the hardcoded `ref:` with `${{ inputs.therock_ref }}`.

### 8. Wire `therock_ref` through the call chain

`therock-ci-linux.yml` and `therock-ci-windows.yml` both call
`./.github/workflows/therock-test-packages.yml` via `uses:` in their
`therock-test-linux` / `therock-test-windows` jobs. Update those `with:`
blocks to also pass:
```yaml
therock_ref: ${{...

</details>



<!-- START COPILOT CODING AGENT SUFFIX -->

*This pull request was created from Copilot chat.*
>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: JC <justchen@amd.com>
kailash-khalasi added a commit that referenced this pull request Jun 9, 2026
Bumps the TheRock commit hash in `.github/actions/ci-env/action.yml`
from `685f8c3b` to `6e74853c180a1a392d09cf17fd9cec5d25ac3b5e`.

Same pattern as #7582.
cderb pushed a commit that referenced this pull request Jun 12, 2026
Bumps the TheRock commit hash in `.github/actions/ci-env/action.yml`
from `685f8c3b` to `6e74853c180a1a392d09cf17fd9cec5d25ac3b5e`.

Same pattern as #7582.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants