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
2 changes: 1 addition & 1 deletion .github/actions/bootstrap/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ runs:
run: pnpm install -w --filter ${{ inputs.package }}...
shell: bash
- name: Build
if: ${{ inputs.skip-build == 'false' }}
if: inputs.skip-build == 'false'
run: pnpm run --filter ${{ inputs.package }}... build
shell: bash
18 changes: 3 additions & 15 deletions .github/workflows/api-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
paths:
- '.github/workflows/api-client.yml'
- '.github/actions/bootstrap/action.yml'
- '.github/minimal-rmf/**'
- 'packages/api-client/**'
push:
Expand All @@ -15,12 +16,8 @@ jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -29,16 +26,7 @@ jobs:
shell: bash
working-directory: packages/api-client
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v4
with:
ref: main
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v4
with:
ref: ${{ matrix.ros_distribution }}
- uses: actions/checkout@v5
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand Down
20 changes: 4 additions & 16 deletions .github/workflows/api-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
paths:
- '.github/workflows/api-server.yml'
- '.github/actions/bootstrap/action.yml'
- '.github/minimal-rmf/**'
- 'packages/api-server/**'
push:
Expand All @@ -18,12 +19,8 @@ jobs:
tests:
name: Tests
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -32,24 +29,15 @@ jobs:
shell: bash
working-directory: packages/api-server
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v4
with:
ref: main
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v4
with:
ref: ${{ matrix.ros_distribution }}
- uses: actions/checkout@v5
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: api-server
skip-build: true
- name: tests
run: |
. /opt/ros/${{ matrix.ros_distribution }}/setup.bash
. /opt/ros/rolling/setup.bash
pnpm run lint
pnpm run test:cov -v
../../.venv/bin/python -m coverage xml
Expand Down
148 changes: 144 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
ros_distribution: [jazzy, rolling]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to docker
Expand All @@ -41,7 +41,7 @@ jobs:
matrix:
ros_distribution: [jazzy, rolling]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to docker
Expand All @@ -68,7 +68,7 @@ jobs:
matrix:
ros_distribution: [jazzy, rolling]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to docker
Expand All @@ -88,6 +88,146 @@ jobs:
ghcr.io/${{ github.repository }}/api-server:${{ matrix.ros_distribution }}-nightly
${{ matrix.ros_distribution == 'rolling' && format('ghcr.io/{0}/api-server:latest', github.repository) || null}}
context: .github/api-server
api-client:
needs: build-minimal-rmf-docker-images
name: Test API client
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/api-client
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v5
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v5
with:
ref: ${{ matrix.ros_distribution }}
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: api-client
- name: lint
run: pnpm run lint
- name: test
run: pnpm test
api-server:
needs: build-minimal-rmf-docker-images
name: Test API server
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/api-server
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v5
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v5
with:
ref: ${{ matrix.ros_distribution }}
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: api-server
skip-build: true
- name: tests
run: |
. /opt/ros/${{ matrix.ros_distribution }}/setup.bash
pnpm run lint
pnpm run test
rmf-dashboard-framework:
needs: build-minimal-rmf-docker-images
name: Test dashboard framework
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/rmf-dashboard-framework
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v5
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v5
with:
ref: ${{ matrix.ros_distribution }}
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard-framework
skip-build: true
- name: lint
run: pnpm lint
- name: unit test
run: pnpm run test
ros-translator:
needs: build-minimal-rmf-docker-images
name: Test ros-translator
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/ros-translator
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v5
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v5
with:
ref: ${{ matrix.ros_distribution }}
- name: dependencies
run: apt update && apt install ros-dev-tools -y
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: ros-translator
skip-build: true
- name: test
run: . /opt/ros/${{ matrix.ros_distribution }}/setup.bash && pnpm test
# dashboard-e2e:
# strategy:
# matrix:
Expand All @@ -104,7 +244,7 @@ jobs:
# shell: bash
# working-directory: packages/dashboard-e2e
# steps:
# - uses: actions/checkout@v4
# - uses: actions/checkout@v5
# - name: bootstrap
# uses: ./.github/actions/bootstrap
# with:
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/rmf-dashboard-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
paths:
- '.github/workflows/rmf-dashboard-framework.yml'
- '.github/actions/bootstrap/action.yml'
- '.github/minimal-rmf/**'
- 'packages/rmf-dashboard-framework/**'
- 'packages/rmf-models/**'
Expand All @@ -19,12 +20,8 @@ jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -33,16 +30,7 @@ jobs:
shell: bash
working-directory: packages/rmf-dashboard-framework
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v4
with:
ref: main
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v4
with:
ref: ${{ matrix.ros_distribution }}
- uses: actions/checkout@v5
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand Down
21 changes: 5 additions & 16 deletions .github/workflows/ros-translator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
paths:
- '.github/workflows/ros-translator.yml'
- '.github/actions/bootstrap/action.yml'
- '.github/minimal-rmf/**'
- 'packages/ros-translator/**'
push:
Expand All @@ -17,12 +18,8 @@ jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
ros_distribution: [jazzy, rolling]
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf:${{ matrix.ros_distribution }}-nightly
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -31,21 +28,13 @@ jobs:
shell: bash
working-directory: packages/ros-translator
steps:
- name: Checkout main for rolling
if: matrix.ros_distribution == 'rolling'
uses: actions/checkout@v4
with:
ref: main
- name: Checkout ros_distribution branch
if: matrix.ros_distribution != 'rolling'
uses: actions/checkout@v4
with:
ref: ${{ matrix.ros_distribution }}
- uses: actions/checkout@v5
- name: dependencies
run: apt update && apt install ros-dev-tools -y
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: ros-translator
skip-build: true
- name: test
run: . /opt/ros/${{ matrix.ros_distribution }}/setup.bash && pnpm test
run: . /opt/ros/rolling/setup.bash && pnpm test
2 changes: 1 addition & 1 deletion packages/api-client/lib/openapi/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* tslint:disable */
/* eslint-disable */

/**
* RMF API Server
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
Expand Down
2 changes: 1 addition & 1 deletion packages/api-server/api_server/routes/tasks/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def test_cancel_task(self):
resp = self.client.post(
"/tasks/cancel_task",
content=mdl.CancelTaskRequest(
type="cancel_task_request"
type="cancel_task_request", task_id="task_id", labels=None
).model_dump_json(exclude_none=True),
)
self.assertEqual(200, resp.status_code, resp.content)
Expand Down
4 changes: 2 additions & 2 deletions packages/rmf-dashboard-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"build:example": "pnpm run --filter {.}^... build && vite -c examples/shared/vite.config.ts build",
"build-storybook": "storybook build",
"gen-app-config-schema": "pnpm typescript-json-schema tsconfig.gen.json AppConfig --required -o app-config.schema.json",
"lint": "tsc --build && eslint --max-warnings 0 src",
"lint": "pnpm --filter=rmf-dashboard-framework^... build && tsc --build && eslint --max-warnings 0 src",
"start:example": "pnpm --filter=rmf-dashboard-framework^... build && vite -c examples/shared/vite.config.ts",
"storybook": "storybook dev -p 6006",
"test": "vitest",
"test": "pnpm --filter=rmf-dashboard-framework^... build && vitest",
"test:coverage": "vitest --coverage"
},
"peerDependencies": {
Expand Down
Loading