diff --git a/.github/workflows/cpp_ubuntu20_04.yml b/.github/workflows/cpp_ubuntu20_04.yml index e7c738a..8b9f0ba 100644 --- a/.github/workflows/cpp_ubuntu20_04.yml +++ b/.github/workflows/cpp_ubuntu20_04.yml @@ -12,8 +12,8 @@ jobs: matrix: rosdistro: ['noetic'] gcc: ['8', '9', '10'] - container: ros:${{ matrix.config.rosdistro }}-ros-base-focal - name: ROS ${{ matrix.config.rosdistro }} - GCC ${{ matrix.config.gcc }} + container: ros:${{ matrix.rosdistro }}-ros-base-focal + name: ROS ${{ matrix.rosdistro }} - GCC ${{ matrix.gcc }} steps: - uses: actions/checkout@v3 name: Checkout lpp @@ -25,8 +25,8 @@ jobs: - name: Install newest git version run: sudo apt update && sudo apt-get install -y software-properties-common && sudo add-apt-repository -y ppa:git-core/ppa && sudo apt-get update && sudo apt-get install -y git - - name: Install GCC version ${{ matrix.config.gcc}} - run: sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa -y && sudo apt update && sudo apt install -y gcc-${{ matrix.config.gcc}} g++-${{ matrix.config.gcc}} && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.config.gcc}} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ matrix.config.gcc}} + - name: Install GCC version ${{ matrix.gcc }} + run: sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa -y && sudo apt update && sudo apt install -y gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }} && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ matrix.gcc }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ matrix.gcc }} - name: Install catkin tools run: sudo apt install -y python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential python3-catkin-tools @@ -35,11 +35,11 @@ jobs: run: sudo apt install -y libgoogle-glog-dev - name: Build lpp - run: source /opt/ros/${{ matrix.config.rosdistro }}/setup.bash && catkin build lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash + run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash working-directory: catkin_ws shell: bash - name: Run unittests - run: source /opt/ros/${{ matrix.config.rosdistro }}/setup.bash && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash && rosrun lpp test_lpp && rosrun lpp test_glog && rosrun lpp test_lpp_custom && rosrun lpp test_nolog && rosrun lpp test_default && rosrun lpp test_roslog + run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash && rosrun lpp test_lpp && rosrun lpp test_glog && rosrun lpp test_lpp_custom && rosrun lpp test_nolog && rosrun lpp test_default && rosrun lpp test_roslog working-directory: catkin_ws shell: bash