Revert "Port CI fixes from #955 but targeting ubuntu 22 and ROS 2 Hum…

…ble" This reverts commit 1fd22ee.
open-rmf · Jul 4, 2024 · 2e9cb5c · 2e9cb5c
1 parent 1fd22ee
commit 2e9cb5c
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 82 deletions.
diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml
@@ -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 }}'

diff --git a/.github/minimal-rmf/Dockerfile b/.github/minimal-rmf/Dockerfile
diff --git a/.github/workflows/api-client.yml b/.github/workflows/api-client.yml
@@ -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:

diff --git a/.github/workflows/api-server.yml b/.github/workflows/api-server.yml
@@ -7,9 +7,6 @@ on:
   push:
     branches:
       - main
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 env:
   CI: true
   PIPENV_VERBOSITY: -1
@@ -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:

diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
@@ -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:

diff --git a/.github/workflows/react-components.yml b/.github/workflows/react-components.yml
@@ -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:
@@ -41,4 +37,4 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
-          flags: react-components
+          flags: react-components
diff --git a/.github/workflows/rmf-auth.yml b/.github/workflows/rmf-auth.yml
@@ -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:

diff --git a/.github/workflows/ros-translator.yml b/.github/workflows/ros-translator.yml
@@ -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: