Merge pull request #836 from gazebosim/scpeters/merge_6_7

Merge ign-rendering6 ➡️ gz-rendering7
gazebosim · Mar 17, 2023 · c2e72ee · c2e72ee
2 parents 299a80f + 137490e
commit c2e72ee
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 195 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal
@@ -22,7 +22,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/COPYING b/COPYING