Skip to content

chore: support adaptor wheel overrides on Windows and Linux - #531

Merged
karthikbekalp merged 4 commits into
aws-deadline:mainlinefrom
karthikbekalp:codex/fix-adaptor-wheel-platforms
Aug 18, 2026
Merged

chore: support adaptor wheel overrides on Windows and Linux#531
karthikbekalp merged 4 commits into
aws-deadline:mainlinefrom
karthikbekalp:codex/fix-adaptor-wheel-platforms

Conversation

@karthikbekalp

@karthikbekalp karthikbekalp commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

What was the problem/requirement? (What/Why)

The Include Adaptor Wheels developer option used a Linux-specific Bash setup action and hard-coded worker paths, so locally built adaptor wheels could not be exercised reliably on Windows workers.

What was the solution? (How)

  • Replace the Bash override action with an embedded cross-platform Python setup script.
  • Create a worker virtual environment with the active queue Python, install the three attached wheels without replacing queue dependencies, and propagate the virtual environment through OpenJD environment changes.
  • Validate the installed adaptor executable and emit its attached package version in an ADAPTOR_OVERRIDE_READY diagnostic marker.
  • Correct wheel-directory and normalized Cinema 4D wheel-name validation.
  • Add focused tests for Windows and Linux paths, wheel selection, environment changes, and package-version reporting.

What is the impact of this change?

The developer-only Include Adaptor Wheels workflow now works on Windows and Linux workers. Normal submissions that do not enable the option are unchanged.

How was this change tested?

  • hatch run fmt
  • hatch run lint
  • hatch run all.py3.11:lint (reproduces the previously failing CI environment)
  • hatch run test (380 passed, 6 skipped)

Both live jobs in Windows and Linux loaded the exact attached Cinema 4D adaptor wheel, emitted ADAPTOR_OVERRIDE_READY, and completed cinema4d-openjd --help successfully.

Was this change documented?

No documentation change is required for this developer-only option.

Is this a breaking change?

No.


By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@karthikbekalp
karthikbekalp requested a review from a team as a code owner August 18, 2026 19:21
@github-actions github-actions Bot added the waiting-on-maintainers Waiting on the maintainers to review. label Aug 18, 2026
Comment thread src/deadline/cinema4d_submitter/adaptor_override_environment.yaml
Comment thread src/deadline/cinema4d_submitter/setup_adaptor_wheels.py Outdated
Comment thread src/deadline/cinema4d_submitter/setup_adaptor_wheels.py Outdated
@karthikbekalp
karthikbekalp marked this pull request as draft August 18, 2026 19:28
Comment thread src/deadline/cinema4d_submitter/setup_adaptor_wheels.py
Comment thread src/deadline/cinema4d_submitter/setup_adaptor_wheels.py Outdated
Comment thread src/deadline/cinema4d_submitter/cinema4d_render_submitter.py Outdated
@karthikbekalp
karthikbekalp marked this pull request as ready for review August 18, 2026 20:13
@karthikbekalp
karthikbekalp marked this pull request as draft August 18, 2026 20:14
Signed-off-by: Karthik Bekal Pattathana <133984042+karthikbekalp@users.noreply.github.com>
Signed-off-by: Karthik Bekal Pattathana <133984042+karthikbekalp@users.noreply.github.com>
Signed-off-by: Karthik Bekal Pattathana <133984042+karthikbekalp@users.noreply.github.com>
@karthikbekalp
karthikbekalp force-pushed the codex/fix-adaptor-wheel-platforms branch from 08e1941 to 3f8b21b Compare August 18, 2026 20:14
@karthikbekalp karthikbekalp changed the title fix: support adaptor wheel overrides on Windows and Linux chore: support adaptor wheel overrides on Windows and Linux Aug 18, 2026
@karthikbekalp
karthikbekalp marked this pull request as ready for review August 18, 2026 20:16
@karthikbekalp
karthikbekalp enabled auto-merge (squash) August 18, 2026 20:16
@karthikbekalp
karthikbekalp merged commit 3210d7a into aws-deadline:mainline Aug 18, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

waiting-on-maintainers Waiting on the maintainers to review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants