Skip to content

Merges changes from main#5824

Merged
kellyguo11 merged 1 commit into
isaac-sim:developfrom
kellyguo11:merge-main-0527
May 28, 2026
Merged

Merges changes from main#5824
kellyguo11 merged 1 commit into
isaac-sim:developfrom
kellyguo11:merge-main-0527

Conversation

@kellyguo11
Copy link
Copy Markdown
Contributor

Description

Merge changes from main branch:

@kellyguo11 kellyguo11 requested a review from hhansen-bdai as a code owner May 28, 2026 01:48
@github-actions github-actions Bot added documentation Improvements or additions to documentation isaac-lab Related to Isaac Lab team infrastructure labels May 28, 2026
@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps Bot commented May 28, 2026

Greptile Summary

This PR merges a batch of improvements from main into develop, covering CI workflow enhancements, documentation fixes, a .dockerignore correction, skrl 2.0.0 template updates, and a docstring swap fix in string.py.

  • Nightly changelog refactor (nightly-changelog.yml): the workflow is parameterized to compile fragments across a configurable set of branches via a matrix strategy, switches from a PAT to a short-lived GitHub App token (isaaclab-bot), moves concurrency control to per-branch groups, and adds explicit refs/heads/ push refs with a pre-push rebase to handle concurrent human commits.
  • skrl 2.0.0 template updates (skrl_amp_cfg, skrl_ippo_cfg, skrl_mappo_cfg): renames preprocessor keys (state_preprocessorobservation_preprocessor, shared_state_preprocessor removed) and reward scale fields to match the new skrl API; MAPPO critic input corrected from OBSERVATIONS to STATES.
  • Minor fixes: .dockerignore drops the stray ? wildcard that was preventing the _isaac_sim symlink from being excluded; preserve_order docstrings in string.py are swapped back to the correct descriptions.

Confidence Score: 4/5

Safe to merge; all functional changes are well-reasoned and the workflow refactor includes good security practices around token scope and branch-name injection.

The only finding is a mismatch between the secret name documented in the header comment (CHANGELOG_APP_ID) and the secret actually consumed by the action (CHANGELOG_APP_CLIENT_ID). If a maintainer follows the comment to configure the repo, the token-mint step will fail. Everything else — the docstring swap fix, .dockerignore correction, skrl 2.0.0 template updates, and the workflow parameterization — looks correct.

.github/workflows/nightly-changelog.yml — verify the repo secrets are named CHANGELOG_APP_CLIENT_ID and CHANGELOG_APP_PRIVATE_KEY (not CHANGELOG_APP_ID) to match what the action actually reads.

Important Files Changed

Filename Overview
.dockerignore Removes the stray ? glob suffix so _isaac_sim (the exact symlink name) is now correctly excluded from Docker context.
.github/workflows/README.md New documentation explaining why scheduled workflows must live on main and how trigger semantics differ across branches.
.github/workflows/docs.yaml Adds force_orphan: true to GitHub Pages deployment step to avoid growing Pages history with unneeded commit objects.
.github/workflows/nightly-changelog.yml Major refactor to parameterize compilation across multiple branches via a matrix strategy and GitHub App token; one secret name in the header comment (CHANGELOG_APP_ID) does not match the actual secret (CHANGELOG_APP_CLIENT_ID).
source/isaaclab/isaaclab/utils/string.py Corrects swapped preserve_order docstring descriptions in resolve_matching_names and resolve_matching_names_values; the code logic itself was already correct.
tools/template/templates/agents/skrl_amp_cfg Updates AMP template for skrl 2.0.0: renames preprocessor keys (state_preprocessorobservation_preprocessor, amp_state_preprocessoramp_observation_preprocessor) and reward scale fields.
tools/template/templates/agents/skrl_ippo_cfg Updates IPPO template for skrl 2.0.0: renames state_preprocessor to observation_preprocessor and nulls out the old field.
tools/template/templates/agents/skrl_mappo_cfg Updates MAPPO template for skrl 2.0.0: switches critic input from OBSERVATIONS to STATES, adds observation_preprocessor, and removes shared_state_preprocessor.

Sequence Diagram

sequenceDiagram
    participant Cron as GitHub Scheduler / workflow_dispatch
    participant Resolve as resolve-branches job
    participant Matrix as compile-changelog (matrix)
    participant AppToken as actions/create-github-app-token
    participant Checkout as actions/checkout
    participant Compile as tools/changelog/cli.py
    participant Remote as GitHub remote (target branch)

    Cron->>Resolve: trigger (schedule → CRON_BRANCHES CSV, dispatch → single branch input)
    Resolve->>Resolve: "CSV → JSON array, validate dispatch=1 branch"
    Resolve-->>Matrix: branches JSON array

    loop for each branch in matrix
        Matrix->>AppToken: mint short-lived token (CHANGELOG_APP_CLIENT_ID + CHANGELOG_APP_PRIVATE_KEY)
        AppToken-->>Matrix: installation token (1 h)
        Matrix->>Checkout: checkout matrix.branch with App token
        Matrix->>Matrix: verify tools/changelog/cli.py exists
        Matrix->>Compile: python3 cli.py compile [--dry-run]
        alt "fragments compiled & not dry_run"
            Matrix->>Remote: git pull --rebase refs/heads/$TARGET_BRANCH
            Matrix->>Remote: git push HEAD:refs/heads/$TARGET_BRANCH
        else no fragments or dry_run
            Matrix->>Matrix: skip commit/push
        end
    end
Loading

Reviews (1): Last reviewed commit: "Merges changes from main" | Re-trigger Greptile

Comment on lines +20 to +22
#
# The push uses a short-lived GitHub App installation token minted from
# ``CHANGELOG_APP_ID`` + ``CHANGELOG_APP_PRIVATE_KEY`` (repo secrets). The
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

P2 Secret name mismatch in header comment

The header comment documents the required secrets as CHANGELOG_APP_ID + CHANGELOG_APP_PRIVATE_KEY, but the action on line 134 actually reads from CHANGELOG_APP_CLIENT_ID + CHANGELOG_APP_PRIVATE_KEY. A maintainer following the comment to configure the repo secrets would create CHANGELOG_APP_ID instead of CHANGELOG_APP_CLIENT_ID, and the token-mint step would silently fail to find the secret.

@kellyguo11 kellyguo11 merged commit 33cffc9 into isaac-sim:develop May 28, 2026
59 of 61 checks passed
kellyguo11 added a commit to kellyguo11/IsaacLab-public that referenced this pull request May 28, 2026
# Description

Merge changes from main branch:

- isaac-sim#4875 - Adds Isaac-Stack-Cube-Franka-IK-Rel-v0 task variants
- isaac-sim#4909 - Updates minor RSL-RL configclass docstring
- isaac-sim#4934 - Updates Newton docs on main for 3.0 beta changes
- isaac-sim#5182 - Fix flatdict version pin to allow 4.1.0+
- isaac-sim#5195 - Add NCCL troubleshooting notes
- isaac-sim#5406 - Updates doc building job on main to match develop
- isaac-sim#5311 - Update skrl integration for version 2.0.0
- isaac-sim#5482 - Adds nightly-changelog.yml on main
- isaac-sim#5527 - Use isaaclab-bot GitHub App token for nightly changelog push
- isaac-sim#5537 - Address deprecation warnings in nightly changelog workflow
- isaac-sim#5746 - Fix .dockerignore for _isaac_sim symlink
- isaac-sim#5745 - Parameterize nightly compile over configurable branches
- isaac-sim#5546 - Fix swapped preserve_order docstrings
- isaac-sim#5817 - Update skrl agent configurations in the Isaac Lab template
kellyguo11 added a commit that referenced this pull request May 28, 2026
… teleop/mimic dependency (#5829)

# Description

Cherry pick bug fix PRs from develop:

- #5821
- #5820
- #5733
- #5824

---------

Signed-off-by: peterd-NV <peterd@nvidia.com>
Co-authored-by: peterd-NV <peterd@nvidia.com>
Co-authored-by: ooctipus <zhengyuz@nvidia.com>
Co-authored-by: matthewtrepte <mtrepte@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation infrastructure isaac-lab Related to Isaac Lab team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant