From ec9322d12a36083c09b9ac7b9a4d490b384300de Mon Sep 17 00:00:00 2001 From: Mario Prats Date: Thu, 16 Apr 2026 12:55:36 +0200 Subject: [PATCH 1/3] update poses in Stitch Multiple Point Clouds Together --- .../objectives/stitch_multiple_point_clouds_together.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lab_sim/objectives/stitch_multiple_point_clouds_together.xml b/src/lab_sim/objectives/stitch_multiple_point_clouds_together.xml index f0274748..ae393ced 100644 --- a/src/lab_sim/objectives/stitch_multiple_point_clouds_together.xml +++ b/src/lab_sim/objectives/stitch_multiple_point_clouds_together.xml @@ -18,7 +18,7 @@ @@ -30,7 +30,7 @@ @@ -42,7 +42,7 @@ From 18def4fadebb858c59f17f3f102ed63dc52ae58c Mon Sep 17 00:00:00 2001 From: David Sobek Date: Mon, 20 Apr 2026 10:36:16 -0600 Subject: [PATCH 2/3] Remove Stack Blocks with ICP --- .../objectives/stack_blocks_with_icp.xml | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 src/lab_sim/objectives/stack_blocks_with_icp.xml diff --git a/src/lab_sim/objectives/stack_blocks_with_icp.xml b/src/lab_sim/objectives/stack_blocks_with_icp.xml deleted file mode 100644 index 0804e4c4..00000000 --- a/src/lab_sim/objectives/stack_blocks_with_icp.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - From 9c3cbf8f1af9db1b260929cf20852543abc2d102 Mon Sep 17 00:00:00 2001 From: Shaur Kumar Date: Mon, 20 Apr 2026 14:12:25 -0600 Subject: [PATCH 3/3] fix: invert dependency so example_ws action gets called in moveit_pro --- .../actions/find_release_branch/action.yaml | 42 ++++++++++++++++ .../workflows/batch-merge-release-branch.yaml | 49 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 .github/actions/find_release_branch/action.yaml create mode 100644 .github/workflows/batch-merge-release-branch.yaml diff --git a/.github/actions/find_release_branch/action.yaml b/.github/actions/find_release_branch/action.yaml new file mode 100644 index 00000000..d5dd87c6 --- /dev/null +++ b/.github/actions/find_release_branch/action.yaml @@ -0,0 +1,42 @@ +name: 'Find Release Branch' +description: 'Find the highest v. branch in the repository.' +outputs: + branch: + description: 'The release branch name (e.g. v9.5).' + value: ${{ steps.find_branch.outputs.branch }} + +runs: + using: 'composite' + steps: + - name: Find highest release branch + id: find_branch + uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 + with: + script: | + const owner = context.repo.owner; + const repo = context.repo.repo; + + const branchPattern = /^v(\d+)\.(\d+)$/; + const branches = await github.paginate(github.rest.repos.listBranches, { + owner, + repo, + per_page: 100, + }); + + const versionBranches = branches + .map(b => b.name) + .filter(name => branchPattern.test(name)) + .sort((a, b) => { + const [, aMajor, aMinor] = a.match(branchPattern).map(Number); + const [, bMajor, bMinor] = b.match(branchPattern).map(Number); + return bMajor - aMajor || bMinor - aMinor; + }); + + if (versionBranches.length === 0) { + core.setFailed('No branch matching v. found.'); + return; + } + + const branch = versionBranches[0]; + core.info(`Found release branch: ${branch}`); + core.setOutput('branch', branch); diff --git a/.github/workflows/batch-merge-release-branch.yaml b/.github/workflows/batch-merge-release-branch.yaml new file mode 100644 index 00000000..4683b3de --- /dev/null +++ b/.github/workflows/batch-merge-release-branch.yaml @@ -0,0 +1,49 @@ +name: Batch Merge Release Branch + +on: + workflow_dispatch: + + schedule: + - cron: '0 5 * * 1-5' # Run before every weekday at 05:00 UTC + +permissions: + contents: write + pull-requests: write + +jobs: + batch-merge-release-branch: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + with: + ref: main + fetch-depth: 0 + lfs: false + + - name: Get current release branch + id: get_current_release_branch + uses: ./.github/actions/find_release_branch + + - name: Merge release branch into main + id: merge + env: + RELEASE_BRANCH: ${{ steps.get_current_release_branch.outputs.branch }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config --global user.email "actions@github.com" + git config --global user.name "GitHub Actions" + RAND_SUFFIX=$RANDOM + git checkout -b merge-$RELEASE_BRANCH-main-$RAND_SUFFIX + git fetch origin $RELEASE_BRANCH + if git merge origin/$RELEASE_BRANCH --no-edit; then + echo "# Merge succeeded without conflicts" >> $GITHUB_STEP_SUMMARY + PR_BODY="Ready for merge!" + else + echo "# Merge failed with conflicts" >> $GITHUB_STEP_SUMMARY + git add -A + git commit -m "Merge $RELEASE_BRANCH into main (with conflicts)" + PR_BODY="⚠️Merge failed with conflicts! Please pull this branch and manually resolve the conflict by resetting this branch and re-merging." + fi + git push origin merge-$RELEASE_BRANCH-main-$RAND_SUFFIX + gh pr create --title "Merge ${{ steps.get_current_release_branch.outputs.branch }} into main" --body "$PR_BODY" --base main --head merge-$RELEASE_BRANCH-main-$RAND_SUFFIX --draft --reviewer shaur-k,JWhitleyWork,dsobek