Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cec5267
wip converting doors panel
Jun 14, 2022
c1bff3c
Merge remote-tracking branch 'origin/main' into feat/window-system-v2
Jun 14, 2022
c3e8f93
port window system from previous pr
Jun 14, 2022
57cb21f
rename to window container to prevent naming conflict with actual win…
Jun 14, 2022
86bf716
working doors window
Jun 15, 2022
ba50612
upgrade deps to fix material forwardRef bug
Jun 15, 2022
f20d1a6
micro app system
Jun 15, 2022
19a0712
add lifts app, support detecting door level, support mangaing workspa…
Jun 15, 2022
76216fa
implement controls
Jun 16, 2022
ea8b252
add map app
Jun 16, 2022
98895bc
add design mode toggle
Jun 16, 2022
06cbf13
ability to add new micro apps to workspace
Jun 16, 2022
f8ae2c9
ported map to microapp, improve state management with the help of rxjs
Jun 17, 2022
e9b730d
add task table app, fixes
Jun 17, 2022
3a699a3
bug fixes
Jun 17, 2022
cc7dedb
finish porting tasks page
Jun 20, 2022
3ba1b4c
ported and improve robot table
Jun 20, 2022
81b9884
port robot infos and improve multiple components
Jun 21, 2022
b3fe19e
add map to robot workspace; many fixes and improvements
Jun 21, 2022
554bf4f
fully support auto refresh in robots app
Jun 21, 2022
4323c02
fix tests
Jun 22, 2022
7bfac73
fix tests and cleanups
Jun 22, 2022
8d0e0be
properly support auto refresh in tasks app
Jun 22, 2022
a143e20
fix robots finish time
Jun 22, 2022
3a853f0
fix deps
Jun 22, 2022
63d2169
Merge remote-tracking branch 'origin/main' into feat/window-system-v2
Jul 6, 2022
90f2824
remove python version check
Jun 28, 2022
a3c7a10
switch to python 3.10
Jun 28, 2022
65052cb
update ci to use ubuntu2204
Jun 29, 2022
bdaeca8
for some reason gh actions 2204 is not using py 3.10
Jun 30, 2022
c8f04fc
remove chrome; not needed since we are using browserstack now
Jun 30, 2022
2044035
update docs
Jun 30, 2022
b782234
Revert "for some reason gh actions 2204 is not using py 3.10"
Jun 30, 2022
016735d
update minimum node version
Jul 5, 2022
9a5ccc0
update package-lock
Jul 5, 2022
9d31af8
update pip lock
Jul 6, 2022
43c95ab
fix fastio to work with newer uvicorn
Jul 6, 2022
092ef94
fix fastio to work with newer uvicorn
Jul 6, 2022
c0d3a85
switch to poetry, update python deps
Jul 7, 2022
71fc792
replace references to pipenv with poetry
Jul 7, 2022
4f8952a
switch to pnpm
Jul 7, 2022
dda4f4d
add back pipenv-install equivalent for poetry
Jul 7, 2022
cf323e8
squash ci spam
Jul 8, 2022
5062ec3
update ci
Jul 8, 2022
c982900
update ci
Jul 8, 2022
eeb22b2
update ci
Jul 8, 2022
d8dd111
fix poetry on ubuntu 20.04
Jul 8, 2022
7703230
ubuntu2204 lock file
Jul 8, 2022
96518cb
remove support for python 3.8; poetry also suffers from inconsistent …
Jul 8, 2022
6173c3f
update ci
Jul 8, 2022
c10901d
update lock file
Jul 8, 2022
b41a5b1
update lock file
Jul 8, 2022
4f7667e
fix using wrong package
Jul 8, 2022
156fde1
Merge remote-tracking branch 'origin/main' into build/pnpm-poetry
Aug 31, 2022
82c18ba
go back to pipenv
Sep 9, 2022
9c8d39d
fix pipenv not found if compatible version already installed in the s…
Sep 9, 2022
b62646b
use workspace reference
Sep 26, 2022
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
27 changes: 27 additions & 0 deletions .github/actions/bootstrap/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: bootstrap
description: bootstrap rmf-web
inputs:
package:
description: string, target package to bootstrap
required: true
skip-build:
description: boolean, if true, skip the build step
required: false
default: "false"
runs:
using: composite
steps:
- uses: pnpm/action-setup@v2.2.2
with:
version: 'latest'
- uses: actions/setup-node@v2
with:
node-version: '16'
cache: 'pnpm'
- name: Install dependencies
run: pnpm install -w --filter ${{ inputs.package }}...
shell: bash
- name: Build
if: '!${{ inputs.skip-build }}'
run: pnpm run --filter ${{ inputs.package }}... build
shell: bash
26 changes: 7 additions & 19 deletions .github/workflows/api-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,21 @@ on:
push:
branches:
- main
env:
CI: true
jobs:
unit-tests:
strategy:
matrix:
npm: ['latest']
fail-fast: false
name: Unit Tests (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Unit Tests
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
working-directory: packages/api-client
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: bootstrap
run: |
pip3 install pipenv
npm install -g npm@${{ matrix.npm }}
scripts/bootstrap.sh api-client
working-directory: .
uses: ./.github/actions/bootstrap
with:
package: api-client
- name: lint
run: npm run lint
run: pnpm run lint
- name: test
run: npm run test
run: pnpm test
28 changes: 10 additions & 18 deletions .github/workflows/api-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@ env:
CI: true
jobs:
tests:
strategy:
matrix:
npm: ['latest']
fail-fast: false
name: Tests (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/e2e
credentials:
Expand All @@ -28,22 +24,18 @@ jobs:
working-directory: packages/api-server
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
run: |
npm install -g npm@${{ matrix.npm }}
. /rmf_demos_ws/install/setup.bash
scripts/bootstrap.sh api-server
working-directory: .
uses: ./.github/actions/bootstrap
with:
package: api-server
- name: tests
run: |
. /rmf_demos_ws/install/setup.bash
npm run lint
npm run test:cov
python3 -m pipenv run python -m coverage xml
pnpm run lint
pnpm run test:cov
../../.venv/pipenv run python -m coverage xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/dashboard-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ env:
CI: true
jobs:
dashboard-e2e:
strategy:
matrix:
npm: ['latest']
fail-fast: false
name: Dashboard e2e (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Dashboard e2e
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/e2e
credentials:
Expand All @@ -30,19 +26,17 @@ jobs:
BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
run: |
npm install -g npm@${{ matrix.npm }}
scripts/bootstrap.sh rmf-dashboard-e2e
working-directory: .
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard-e2e
skip-build: true
- name: test
run: |
. /rmf_demos_ws/install/setup.bash
npm test
pnpm test
- name: upload artifacts
uses: actions/upload-artifact@v2
if: always()
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@ env:
CI: true
jobs:
unit-tests:
strategy:
matrix:
npm: ['latest']
fail-fast: false
name: Unit Tests (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/e2e
credentials:
Expand All @@ -32,18 +28,15 @@ jobs:
working-directory: packages/dashboard
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
run: |
npm install -g npm@${{ matrix.npm }}
. /rmf_demos_ws/install/setup.bash
scripts/bootstrap.sh rmf-dashboard
working-directory: .
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard
skip-build: true
- name: unit test
run: . /rmf_demos_ws/install/setup.bash && npm run test:coverage
run: . /rmf_demos_ws/install/setup.bash && pnpm run test:coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
57 changes: 8 additions & 49 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
build-docker-images:
name: Push Docker images to GitHub Packages
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Push e2e image to GitHub Packages
Expand All @@ -24,8 +24,8 @@ jobs:
npm: ['latest']
fail-fast: false
needs: build-docker-images
name: Dashboard e2e (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Dashboard e2e
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/e2e
options: --privileged --ipc=host
Expand All @@ -39,59 +39,18 @@ jobs:
BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: bootstrap
run: |
npm install -g npm@${{ matrix.npm }}
scripts/bootstrap.sh rmf-dashboard-e2e
working-directory: .
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard-e2e
skip-build: true
- name: test
run: |
. /rmf_demos_ws/install/setup.bash
npm test
pnpm test
- name: upload artifacts
uses: actions/upload-artifact@v2
if: always()
with:
name: artifacts
path: packages/dashboard-e2e/artifacts
reporting-e2e:
strategy:
matrix:
npm: ['latest']
fail-fast: false
needs: build-docker-images
name: Reporting e2e (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
container:
image: ghcr.io/${{ github.repository }}/e2e
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
options: --privileged --ipc=host
defaults:
run:
shell: bash
working-directory: packages/reporting-e2e
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: bootstrap
run: |
npm install -g npm@${{ matrix.npm }}
scripts/bootstrap.sh reporting-e2e
working-directory: .
- name: test
run: npm test
- name: upload artifacts
uses: actions/upload-artifact@v2
if: always()
with:
name: artifacts
path: packages/reporting-e2e/artifacts
29 changes: 9 additions & 20 deletions .github/workflows/react-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ env:
CI: true
jobs:
unit-tests:
strategy:
matrix:
npm: ['latest']
fail-fast: false
name: Unit Tests (npm ${{ matrix.npm }})
runs-on: ubuntu-latest
name: Unit Tests
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
Expand All @@ -28,23 +24,16 @@ jobs:
BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
cache: 'npm'
- name: bootstrap
run: |
pip3 install pipenv
npm config set unsafe-perm
npm install -g npm@${{ matrix.npm }}
scripts/bootstrap.sh react-components
working-directory: .
- name: test build storybook
run: npm run build:storybook
uses: ./.github/actions/bootstrap
with:
package: react-components
- name: build storybook
run: pnpm run build:storybook
- name: lint
run: npm run lint
run: pnpm run lint
- name: test
run: npm run test:coverage
run: pnpm run test:coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
45 changes: 0 additions & 45 deletions .github/workflows/reporting-e2e.yml

This file was deleted.

Loading