Merge pull request #469 from azeey/8_to_11

Merge ign-transport8 ➡️  ign-transport11

.github/workflows/ci.yml

@@ -1,14 +1,20 @@
 name: Ubuntu CI
 
-on: [push, pull_request]
+on:
+ pull_request:
+ push:
+ branches:
+ - 'ign-transport[0-9]?'
+ - 'gz-transport[0-9]?'
+ - 'main'
 
 jobs:
  bionic-ci:
  runs-on: ubuntu-latest
  name: Ubuntu Bionic CI
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Compile and test
  id: ci
  uses: ignition-tooling/action-ignition-ci@bionic
@@ -19,7 +25,7 @@ jobs:
  name: Ubuntu Focal CI
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  - name: Compile and test
  id: ci
  uses: ignition-tooling/action-ignition-ci@focal

.github/workflows/triage.yml

@@ -10,10 +10,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Add ticket to inbox
- uses: technote-space/create-project-card-action@v1
+ uses: actions/add-to-project@v0.5.0
  with:
- PROJECT: Core development
- COLUMN: Inbox
- GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
- CHECK_ORG_PROJECT: true
-
+ project-url: https://github.com/orgs/gazebosim/projects/7
+ github-token: ${{ secrets.TRIAGE_TOKEN }}

Changelog.md

@@ -283,6 +283,34 @@
  and publication, age, and reception statistics.
  * [Pull request 205](https://github.com/ignitionrobotics/ign-transport/pull/205)
 
+### Gazebo Transport 8.5.0 (2024-01-05)
+
+1. Update github action workflows
+ * [Pull request #460](https://github.com/gazebosim/gz-transport/pull/460)
+ * [Pull request #391](https://github.com/gazebosim/gz-transport/pull/391)
+ * [Pull request #392](https://github.com/gazebosim/gz-transport/pull/392)
+
+1. Adds the subcommands for the log command
+ * [Pull request #451](https://github.com/gazebosim/gz-transport/pull/451)
+
+1. Fix topic/service list inconsistency
+ * [Pull request #415](https://github.com/gazebosim/gz-transport/pull/415)
+
+1. Backport Windows fix to ign-transport8
+ * [Pull request #406](https://github.com/gazebosim/gz-transport/pull/406)
+
+1. Fix compatibility with protobuf 22
+ * [Pull request #405](https://github.com/gazebosim/gz-transport/pull/405)
+
+1. Fix compiler warning and signedness issue
+ * [Pull request #401](https://github.com/gazebosim/gz-transport/pull/401)
+
+1. Support clang and std::filesystem
+ * [Pull request #390](https://github.com/gazebosim/gz-transport/pull/390)
+
+1. Pass std::function by value to Node::Subscribe
+ * [Pull request #382](https://github.com/gazebosim/gz-transport/pull/382)
+
 ### Gazebo Transport 8.4.0 (2022-11-17)
 
 1. ign -> gz : Remove redundant namespace references.

src/cmd/transport.bash_completion.sh

@@ -20,6 +20,34 @@
 # This is a per-library function definition, used in conjunction with the
 # top-level entry point in ign-tools.
 
+GZ_LOG_SUBCOMMANDS="
+record
+playback
+"
+
+GZ_LOG_COMPLETION_LIST="
+ -h --help
+ -v --verbose
+"
+
+GZ_PLAYBACK_COMPLETION_LIST="
+ -h --help
+ -v --verbose
+ --file
+ --pattern
+ --remap
+ --wait
+ -f
+"
+
+GZ_RECORD_COMPLETION_LIST="
+ -h --help
+ -v --verbose
+ --file
+ --force
+ --pattern
+"
+
 GZ_SERVICE_COMPLETION_LIST="
  -h --help
  -v --version
@@ -47,11 +75,10 @@ GZ_TOPIC_COMPLETION_LIST="
  --json-output
 "
 
-function _gz_service
-{
+function __get_comp_from_list {
  if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]]; then
  # Specify options (-*) word list for this subcommand
- COMPREPLY=($(compgen -W "$GZ_SERVICE_COMPLETION_LIST" \
+ COMPREPLY=($(compgen -W "$@" \
  -- "${COMP_WORDS[COMP_CWORD]}" ))
  return
  else
@@ -63,29 +90,75 @@ function _gz_service
  fi
 }
 
-function _gz_service_flags
+function _gz_log_playback
 {
- for word in $GZ_SERVICE_COMPLETION_LIST; do
- echo "$word"
- done
+ __get_comp_from_list "$GZ_PLAYBACK_COMPLETION_LIST"
+}
+
+function _gz_log_record
+{
+ __get_comp_from_list "$GZ_RECORD_COMPLETION_LIST"
+}
+
+function _gz_service
+{
+ __get_comp_from_list "$GZ_SERVICE_COMPLETION_LIST"
 }
 
 function _gz_topic
 {
+ __get_comp_from_list "$GZ_TOPIC_COMPLETION_LIST"
+}
+
+# This searches the current list of typed words for one of the subcommands
+# listed in GZ_LOG_SUBCOMMANDS. This should work for most cases, but may fail
+# if a word that looks like a subcommand is used as an argument to a flag.
+function __get_subcommand
+{
+ local known_subcmd
+ local subcmd
+ for ((i=2; $i<=$COMP_CWORD; i++)); do
+ for subcmd in $GZ_LOG_SUBCOMMANDS; do
+ if [[ "${COMP_WORDS[i]}" == "$subcmd" ]]; then
+ known_subcmd="$subcmd"
+ fi
+ done
+ done
+ echo "$known_subcmd"
+}
+
+function _gz_log
+{
+ if [[ $COMP_CWORD > 2 ]]; then
+ local known_subcmd=$(__get_subcommand)
+ if [[ ! -z $known_subcmd ]]; then
+ local subcmd_func="_gz_log_$known_subcmd"
+ if [[ "$(type -t $subcmd_func)" == 'function' ]]; then
+ $subcmd_func
+ return
+ fi
+ fi
+ fi
+
+ # If a subcommand is not found, assume we're still completing the subcommands
+ # or flags for `log`.
  if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]]; then
- # Specify options (-*) word list for this subcommand
- COMPREPLY=($(compgen -W "$GZ_TOPIC_COMPLETION_LIST" \
+ COMPREPLY=($(compgen -W "$GZ_LOG_COMPLETION_LIST" \
  -- "${COMP_WORDS[COMP_CWORD]}" ))
- return
  else
- # Just use bash default auto-complete, because we never have two
- # subcommands in the same line. If that is ever needed, change here to
- # detect subsequent subcommands
- COMPREPLY=($(compgen -o default -- "${COMP_WORDS[COMP_CWORD]}"))
- return
+ COMPREPLY=($(compgen -W "${GZ_LOG_SUBCOMMANDS}" -- ${cur}))
  fi
 }
 
+
+function _gz_service_flags
+{
+ for word in $GZ_SERVICE_COMPLETION_LIST; do
+ echo "$word"
+ done
+}
+
+
 function _gz_topic_flags
 {
  for word in $GZ_TOPIC_COMPLETION_LIST; do