Skip to content

Commit

Permalink
Revert "Port CI fixes from #955 but targeting ubuntu 22 and ROS 2 Hum…
Browse files Browse the repository at this point in the history
…ble"

This reverts commit 1fd22ee.

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
  • Loading branch information
aaronchongth committed Jul 4, 2024
1 parent 1fd22ee commit 01d68fe
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 82 deletions.
12 changes: 11 additions & 1 deletion .github/actions/bootstrap/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,18 @@ inputs:
runs:
using: composite
steps:
- uses: pnpm/action-setup@v2.2.2
with:
version: '8.15.7'
- uses: actions/setup-node@v2
with:
node-version: '16'
cache: 'pnpm'
- name: Install pipenv
run: pip3 install pipenv
shell: bash
- name: Install dependencies
run: pnpm install -w --filter ${{ inputs.package }}...
run: pnpm install -w --filter ${{ inputs.package }}... --no-frozen-lockfile
shell: bash
- name: Build
if: '!${{ inputs.skip-build }}'
Expand Down
34 changes: 0 additions & 34 deletions .github/minimal-rmf/Dockerfile

This file was deleted.

10 changes: 1 addition & 9 deletions .github/workflows/api-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,16 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/api-client
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/api-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
PIPENV_VERBOSITY: -1
Expand All @@ -18,24 +15,28 @@ jobs:
name: Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
image: ghcr.io/${{ github.repository }}/e2e
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/api-server
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
package: api-server
- name: tests
run: |
. /opt/rmf/setup.bash
. /rmf_demos_ws/install/setup.bash
pnpm run lint
pnpm run test:cov -v
../../.venv/bin/python -m coverage xml
pnpm run test:cov
pipenv run python -m coverage xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,34 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
image: ghcr.io/${{ github.repository }}/e2e
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/dashboard
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
env:
NODE_OPTIONS: '--max_old_space_size=4096'
uses: ./.github/actions/bootstrap
with:
package: rmf-dashboard
skip-build: true
- name: unit test
run: pnpm 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
16 changes: 6 additions & 10 deletions .github/workflows/react-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,22 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/react-components
env:
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
BROWSERSTACK_BUILD: ${{ github.head_ref }}:${{ github.event.number }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand All @@ -41,4 +37,4 @@ jobs:
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
with:
flags: react-components
flags: react-components
10 changes: 1 addition & 9 deletions .github/workflows/rmf-auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,18 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/rmf-auth
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ros-translator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@ on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
CI: true
jobs:
unit-tests:
name: Unit Tests
runs-on: ubuntu-22.04
container:
image: ghcr.io/${{ github.repository }}/minimal-rmf
image: ghcr.io/${{ github.repository }}/e2e
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
defaults:
run:
shell: bash
working-directory: packages/ros-translator
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: setup python
run: apt update && apt install -y python3-venv python-is-python3
- name: bootstrap
uses: ./.github/actions/bootstrap
with:
Expand Down

0 comments on commit 01d68fe

Please sign in to comment.