diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2e9eeb..b947a31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,57 +74,6 @@ jobs: exit 1 fi - -# build-r1OpenPose: -# runs-on: ubuntu-latest - -# steps: -# - name: Extract branch name -# shell: bash -# run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT -# id: extract_branch -# - name: Info -# run: | -# echo "Event type: ${{github.event_name}}" -# - name: Change docker to experimental mode -# run: | -# sudo rm -rf /etc/docker/daemon.json -# echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json -# - name: Restart docker daemon -# run: sudo systemctl restart docker -# - uses: actions/checkout@v4 -# - name: Login to DockerHub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# - name: Build the openPose Docker image -# working-directory: docker_stuff/docker_openPose/ -# run: | -# if [ ${{ github.event_name }} == 'schedule' ]; then -# echo "Building development tour openPose image" -# sudo docker build --build-arg ros_distro=${{steps.extract_branch.outputs.branch}} --tag elandini84/r1images:r1OpenPose_devel . -# elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then -# echo "Building stable tour openPose image" -# sudo docker build --build-arg ros_distro=${{steps.extract_branch.outputs.branch}} --tag elandini84/r1images:r1OpenPose_stable . -# else -# echo "Failure!" -# exit 1 -# fi -# - name: Push r1OpenPose image -# run: | -# if [ ${{ github.event_name }} == 'schedule' ]; then -# echo "Pushing r1OpenPose development image" -# docker push elandini84/r1images:r1OpenPose_devel -# elif [ ${{ github.event_name }} == 'workflow_dispatch' ]; then -# echo "Pushing r1OpenPose stable image" -# docker push elandini84/r1images:r1OpenPose_stable -# else -# echo "Failure!" -# exit 1 -# fi - - build-tour-docker-sim: runs-on: ubuntu-latest strategy: diff --git a/docker_stuff/docker_sim2/Dockerfile b/docker_stuff/docker_sim2/Dockerfile index 8d8084c..f570d1b 100644 --- a/docker_stuff/docker_sim2/Dockerfile +++ b/docker_stuff/docker_sim2/Dockerfile @@ -174,7 +174,7 @@ ENV GazeboYARPPlugins_DIR=${robotology_install_folder}/gazebo-yarp-plugins/build # CER USER ${robotology_install_user} WORKDIR ${robotology_install_folder} -RUN git clone https://github.com/elandini84/cer.git -b fix/compatibility/yarp_master +RUN git clone https://github.com/robotology/cer.git RUN cd cer && mkdir build && cd build && cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_cermod_cerDoubleLidar=ON \