From 79acfe44ea18b6a037d716c25a8ac5df2600cd55 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 2 Nov 2023 16:04:38 -0700 Subject: [PATCH 1/2] Add minor comments to BaseGizmoVisual (#881) Signed-off-by: Ian Chen --- include/gz/rendering/base/BaseGizmoVisual.hh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/gz/rendering/base/BaseGizmoVisual.hh b/include/gz/rendering/base/BaseGizmoVisual.hh index ccc329941..0fa9e19c7 100644 --- a/include/gz/rendering/base/BaseGizmoVisual.hh +++ b/include/gz/rendering/base/BaseGizmoVisual.hh @@ -495,6 +495,8 @@ namespace ignition this->visuals[TransformAxis::TA_TRANSLATION_X] = transXVis; this->visuals[TransformAxis::TA_TRANSLATION_Y] = transYVis; this->visuals[TransformAxis::TA_TRANSLATION_Z] = transZVis; + // Store the translation origin visual in this->visuals using a key + // that's not already occupied by the TransformAxis enum this->visuals[TransformAxis::TA_TRANSLATION_Z << 1] = transOrigin; // translation handles @@ -584,6 +586,8 @@ namespace ignition this->visuals[TransformAxis::TA_ROTATION_X] = rotXVis; this->visuals[TransformAxis::TA_ROTATION_Y] = rotYVis; this->visuals[TransformAxis::TA_ROTATION_Z] = rotZVis; + // Store the full rotation visual in this->visuals using a key + // that's not already occupied by the TransformAxis enum this->visuals[TransformAxis::TA_ROTATION_Z << 1] = rotFullVis; // rotation handles From c2fdbcdef28b790adfee869e12bded13ec63935f Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 08:54:33 -0600 Subject: [PATCH 2/2] Update github action workflows (#940) * Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 12 +++++++++--- .github/workflows/triage.yml | 9 +++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2e4d6192..41b5ac4ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-rendering[0-9]' + - 'gz-rendering[0-9]?' + - 'main' jobs: bionic-ci: @@ -8,7 +14,7 @@ jobs: 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 @@ -20,7 +26,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 diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 736670e0e..2332244bf 100644 --- a/.github/workflows/triage.yml +++ b/.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 }}