Merge pull request #491 from gazebosim/scpeters/merge_5_6

Merge ign-physics5 ➡️ gz-physics6
gazebosim · Mar 17, 2023 · 930a223 · 930a223
2 parents 89550c0 + 696437e
commit 930a223
Show file tree

Hide file tree

Showing 3 changed files with 176 additions and 191 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
@@ -21,7 +21,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