Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumps in ionic: use gz-cmake4, gz-utils3, gz-math8 #539

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Bumps in ionic: use gz-cmake4, gz-utils3, gz-math8 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2cd459
Bumps in ionic : ci_matching_branch/bump_ionic_gz-common6
azeey Oct 6, 2023
677d6c2
Disable focal CI
scpeters Oct 13, 2023
983b96d
Merge branch 'main' into ci_matching_branch/bump_ionic_gz-common6
scpeters Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ libavutil-dev
libfreeimage-dev
libgdal-dev
libgts-dev
libgz-cmake3-dev
libgz-math7-dev
libgz-utils2-dev
libgz-cmake4-dev
libgz-math8-dev
libgz-utils3-dev
libswscale-dev
libtinyxml2-dev
pkg-config
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@ name: Ubuntu CI
on: [push, pull_request]

jobs:
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@focal
with:
codecov-enabled: true
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
Expand All @@ -23,3 +12,5 @@ jobs:
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
with:
codecov-enabled: true
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
popd
echo '# END SECTION'
fi
# gz-math7 has problems with swig, remove it for now
# gz-math8 has problems with swig, remove it for now
brew remove swig || true
brew install --only-dependencies ${PACKAGE};
- run: mkdir build
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
#============================================================================
# Find gz-cmake
#============================================================================
find_package(gz-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
find_package(gz-cmake4 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})

#============================================================================
# Configure the project
Expand Down Expand Up @@ -49,13 +49,13 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")

#--------------------------------------
# Find gz-math
gz_find_package(gz-math7 REQUIRED_BY geospatial graphics events)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
gz_find_package(gz-math8 REQUIRED_BY geospatial graphics events)
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})

#--------------------------------------
# Find gz-utils
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
gz_find_package(gz-utils3 REQUIRED)
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})

#--------------------------------------
# Find Tinyxml2
Expand Down
Loading