From c88622032c17151d01cbdfe8348317bf7d919cbf Mon Sep 17 00:00:00 2001 From: Matthias Mayr Date: Fri, 18 Oct 2024 03:17:03 +0200 Subject: [PATCH 1/3] New: Adds SkiROS2 planning solutions that produce the right skill sequence - Adds pre- and postconditions to the skills so they can be used for planning - Manual solution execution is verified - Planning gives the right skill sequence in all 4 problems - Sometimes the solution execution trip up on a blackboard parameter - Problem 4 needs to plan to access the charger first since we can not add a precondition without disturbing problem 2 and 3 --- dependencies/SkiROS2/skiros2 | 2 +- technologies/SkiROS2/skiros2_pyrobosim_lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/SkiROS2/skiros2 b/dependencies/SkiROS2/skiros2 index 9089cae..740e98f 160000 --- a/dependencies/SkiROS2/skiros2 +++ b/dependencies/SkiROS2/skiros2 @@ -1 +1 @@ -Subproject commit 9089caea0642269ed0e004ca974506c61275a8a3 +Subproject commit 740e98fa353af7969869785df7bc05c84ccaf638 diff --git a/technologies/SkiROS2/skiros2_pyrobosim_lib b/technologies/SkiROS2/skiros2_pyrobosim_lib index d351882..5c02742 160000 --- a/technologies/SkiROS2/skiros2_pyrobosim_lib +++ b/technologies/SkiROS2/skiros2_pyrobosim_lib @@ -1 +1 @@ -Subproject commit d351882b3d78b4ef65a4aeb517eeb9467a91f529 +Subproject commit 5c027424bea525149812f24b6b539f4604cd971b From 9fb036513c58dde60bacbcaef1f7e7591a904e8d Mon Sep 17 00:00:00 2001 From: maxxlife Date: Fri, 18 Oct 2024 10:02:09 +0200 Subject: [PATCH 2/3] Add step to install Dev Containers extension in README (#74) Add step to install Dev Containers extension to see option "Attach Visual Studio Code". --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 632164c..a022b69 100644 --- a/README.md +++ b/README.md @@ -118,6 +118,7 @@ It will ask you for your `sudo` password. ### Develop inside the container using VSCode If you want to develop inside the container using VSCode, you need to have the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) installed. +To see option "Attach Visual Studio Code" you also need to download VS Code extenstion Dev Containers. Attach to the container as shown in the image below: From adaa0ff9ca27e72007d615d48195cc52177b1988 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:06:31 -0400 Subject: [PATCH 3/3] Fix typo in README.md and fix CI from forks (#76) * Fix typo and add URL to README.md This one is actually from my fork... * Update lint.yml * Do not push to ghcr from forks * Gate release step as well --- .github/workflows/docker.yml | 6 +++++- .github/workflows/lint.yml | 1 - README.md | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0568aca..a421234 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,7 +50,9 @@ jobs: src/technologies/convince/task_2_solution/ docker compose run test bash -c "source /delib_ws/install/setup.bash && pytest /delib_ws/src/dependencies/convince/AS2FM/test" docker compose down --remove-orphans - - name: Push to gh registry with sha and branch name + - name: Push to gh registry with sha and branch + # Do not push on PRs from forks. + if: ${{ !github.event.pull_request.head.repo.fork }} run: | echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin # tag with sha and push @@ -72,6 +74,8 @@ jobs: run: | docker save ${{ env.REGISTRY_IMAGE }}:${{ env.TAG_NAME }} | gzip > ./roscon_delib_ws_2024.tar.gz - name: Release + # Do not release on PRs from forks. + if: ${{ !github.event.pull_request.head.repo.fork }} uses: ncipollo/release-action@v1 with: artifacts: './roscon_delib_ws_2024.tar.gz' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2b6c7c4..8f80cf5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,6 @@ on: push: branches: [main] pull_request: - branches: [main] jobs: pre-commit: diff --git a/README.md b/README.md index a022b69..fd7916d 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ It will ask you for your `sudo` password. ### Develop inside the container using VSCode If you want to develop inside the container using VSCode, you need to have the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) installed. -To see option "Attach Visual Studio Code" you also need to download VS Code extenstion Dev Containers. +To see the option "Attach Visual Studio Code", you also need to download the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers). Attach to the container as shown in the image below: