windows,ros1, ros2 ci back to default

PX4 · Nov 18, 2024 · 4baec75 · 4baec75
1 parent accca6f
commit 4baec75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 55 deletions.
diff --git a/.github/workflows/ros1.yaml b/.github/workflows/ros1.yaml
@@ -11,23 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: |
-          wget -qO - https://dist.apache.org/repos/dist/release/arrow/KEYS | gpg --dearmor -o /usr/share/keyrings/apache-arrow-keyring.gpg
-          echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://apache.jfrog.io/artifactory/arrow/ubuntu/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/apache-arrow.list
-
-          sudo apt update
-          sudo apt install -y libmosquitto-dev libqtav-dev libarrow-dev libparquet-dev pkg-config
-
-          git clone https://github.com/abseil/abseil-cpp.git
-          cd abseil-cpp
-          mkdir build && cd build
-          cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local ..
-          make -j$(nproc)
-          sudo make install
-      - name: Run industrial_ci
-        uses: ros-industrial/industrial_ci@master
-        env: ${{ matrix.env }}
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}
         with:
-          config: |
-            - name: plotjuggler
+            package-name: plotjuggler
diff --git a/.github/workflows/ros2.yaml b/.github/workflows/ros2.yaml
@@ -12,28 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y pkg-config libmosquitto-dev libqtav-dev libparquet-dev
-          git clone https://github.com/abseil/abseil-cpp.git
-          cd abseil-cpp
-          mkdir build && cd build
-          cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local ..
-          make -j$(nproc)
-          sudo make install
-
-          cd ~
-          git clone https://github.com/apache/arrow.git
-          cd arrow/cpp
-          mkdir build && cd build
-          cmake -DARROW_PARQUET=ON -DARROW_PYTHON=OFF -DARROW_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=/usr/local ..
-          make -j$(nproc)
-          sudo make install
-          
-      - name: Run industrial_ci
-        uses: ros-industrial/industrial_ci@master
-        env: ${{ matrix.env }}
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}
         with:
-          config: |
-            - name: plotjuggler
+            package-name: plotjuggler
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -19,14 +19,6 @@ jobs:
       - name: Sync repository
         uses: actions/checkout@v2
 
-      - name: Set up vcpkg
-        shell: bash
-        run: |
-          git clone https://github.com/microsoft/vcpkg.git
-          ./vcpkg/bootstrap-vcpkg.sh
-          ./vcpkg/vcpkg.exe install
-          echo "VCPKG_ROOT=$(pwd)/vcpkg" >> $GITHUB_ENV
-
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v1  # not v2!
@@ -44,10 +36,9 @@ jobs:
 
       - name: Build Plotjuggler
         shell: pwsh
-        run: |
-          cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake PlotJuggler;
+        run: >
+          cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
           cmake --build build --target install
-
       - name: Setup tmate session
         if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+        uses: mxschmitt/action-tmate@v3