Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .github/actions/find_release_branch/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: 'Find Release Branch'
description: 'Find the highest v<major>.<minor> 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<major>.<minor> found.');
return;
}

const branch = versionBranches[0];
core.info(`Found release branch: ${branch}`);
core.setOutput('branch', branch);
8 changes: 4 additions & 4 deletions .github/workflows/batch-merge-release-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
batch-merge-release-branch:
runs-on: ubuntu-latest
steps:
- name: Get current release branch
id: get_current_release_branch
uses: PickNikRobotics/moveit_pro/.github/actions/find_release_branch@v9.2

- 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:
Expand Down
39 changes: 0 additions & 39 deletions src/lab_sim/objectives/stack_blocks_with_icp.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Action
ID="CreateStampedPose"
orientation_xyzw="0;-1;0;0"
position_xyz="0.5;0.1;0.5"
position_xyz="0.0;0.5;0.8"
stamped_pose="{pose1}"
reference_frame="world"
/>
Expand All @@ -30,7 +30,7 @@
<Action
ID="CreateStampedPose"
orientation_xyzw="0;-1;0;0"
position_xyz="0.6;0.2;0.5"
position_xyz="0.3;0.4;0.8"
stamped_pose="{pose2}"
reference_frame="world"
/>
Expand All @@ -42,7 +42,7 @@
<Action
ID="CreateStampedPose"
orientation_xyzw="0;-1;0;0"
position_xyz="0.4;0.3;0.5"
position_xyz="0.6;0.5;0.8"
stamped_pose="{pose3}"
reference_frame="world"
/>
Expand Down
Loading