Fix workflow

Signed-off-by: Aaron Chong <[email protected]>
open-rmf · Jul 5, 2024 · 7e94210 · 7e94210
1 parent 822a6b5
commit 7e94210
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml
@@ -28,14 +28,3 @@ runs:
       if: '!${{ inputs.skip-build }}'
       run: pnpm run --filter ${{ inputs.package }}... build
       shell: bash
-    # This is only a temporary measure for deployment CI while we migrate to Jazzy and Noble on main
-    - name: Setup minimal RMF on Humble
-      run: |
-        mkdir -p /minimal_rmf && cd /minimal_rmf \
-        && curl -sL https://github.com/open-rmf/rmf_internal_msgs/archive/refs/heads/main.tar.gz -o rmf_internal_msgs.tar.gz \
-        && curl -sL https://github.com/open-rmf/rmf_building_map_msgs/archive/refs/heads/main.tar.gz -o rmf_building_map_msgs.tar.gz \
-        && mkdir -p /minimal_rmf/src/rmf/rmf_internal_msgs && tar zxf rmf_internal_msgs.tar.gz -C /minimal_rmf/src/rmf/rmf_internal_msgs --strip-components=1 && rm rmf_internal_msgs.tar.gz \
-        && mkdir -p /minimal_rmf/src/rmf/rmf_building_map_msgs && tar zxf rmf_building_map_msgs.tar.gz -C /minimal_rmf/src/rmf/rmf_building_map_msgs --strip-components=1 && rm rmf_building_map_msgs.tar.gz
-        . /opt/ros/humble/setup.sh
-        colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release
-      shell: bash
diff --git a/.github/workflows/api-server.yml b/.github/workflows/api-server.yml
@@ -31,13 +31,25 @@ jobs:
         uses: ./.github/actions/bootstrap
         with:
           package: api-server
+      # This is only a temporary measure for deployment CI while we migrate to Jazzy and Noble on main
+      - name: Setup minimal RMF on Humble
+        run: |
+          mkdir -p minimal_rmf && cd minimal_rmf \
+          && curl -sL https://github.com/open-rmf/rmf_internal_msgs/archive/refs/heads/main.tar.gz -o rmf_internal_msgs.tar.gz \
+          && curl -sL https://github.com/open-rmf/rmf_building_map_msgs/archive/refs/heads/main.tar.gz -o rmf_building_map_msgs.tar.gz \
+          && mkdir -p src/rmf/rmf_internal_msgs && tar zxf rmf_internal_msgs.tar.gz -C src/rmf/rmf_internal_msgs --strip-components=1 && rm rmf_internal_msgs.tar.gz \
+          && mkdir -p src/rmf/rmf_building_map_msgs && tar zxf rmf_building_map_msgs.tar.gz -C src/rmf/rmf_building_map_msgs --strip-components=1 && rm rmf_building_map_msgs.tar.gz
+          . /rmf_demos_ws/install/setup.bash
+          colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release
+        shell: bash
       - name: tests
         run: |
-          . /minimal_rmf/install/setup.bash
+          . minimal_rmf/install/setup.bash
           pnpm run lint
           pnpm run test:cov
           pipenv run python -m coverage xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
           flags: api-server
+
diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
@@ -38,7 +38,7 @@ jobs:
           package: rmf-dashboard
           skip-build: true
       - name: unit test
-        run: . /minimal_rmf/install/setup.bash && 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/ghpages.yml b/.github/workflows/ghpages.yml
@@ -51,7 +51,7 @@ jobs:
           package: api-server
       - name: Extract docs
         run: |
-          . /minimal_rmf/install/setup.bash
+          . /rmf_demos_ws/install/setup.bash
           pipenv run python3 scripts/extract_docs.py -o docs
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1