Skip to content

Commit

Permalink
Check versions of nsis and nlohman_json.
Browse files Browse the repository at this point in the history
  • Loading branch information
jackjansen committed Jan 15, 2025
1 parent 285a12a commit 8a7d310
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ find_package(PCL REQUIRED COMPONENTS common io octree filters features geometry
#
# First see if it is already installed.

find_package(nlohmann_json 3.11.2)
find_package(nlohmann_json 3.11.3)

if(NOT nlohmann_json_FOUND)
# If it is not installed already we download a private copy.
set(FETCHCONTENT_QUIET OFF)
include(FetchContent)

FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz)
FetchContent_MakeAvailable(json)
endif()

Expand Down
10 changes: 5 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ When creating a new release, ensure the following have been done
- Update `scripts/install-3rdparty-osx1015.sh` with the best Python version.
- Check the Ubuntu install-3rdparty scripts for which Python they install.
- Check `.github/workflows/build.yml` for the Python versions used.

- Check whether `nlohman_json` can be updated (`CMakeLists.txt`)
- Check whether `nsis` can be updated (`.github/workflows/build.yml`)
- Dependencies for the `.deb` installer for apt/Ubuntu need to be updated. There may be better ways to do this, but this works:
- On the targeted Ubuntu, check out and edit `CMakeFiles/CwipcInstallers.cmake`
- Comment out the definitions for `CPACK_DEBIAN_PACKAGE_DEPENDS` and `CPACK_DEBIAN_PACKAGE_RECOMMENDS`.
Expand All @@ -415,20 +416,19 @@ When creating a new release, ensure the following have been done
```

- `setup.py` may still have a version string somewhere.

- `CWIPC_API_VERSION` incremented if there are any API changes (additions only).
- `CWIPC_API_VERSION_OLD` incremented if there are API changes that are not backward compatible.
- Both these need to be changed in `api.h` and `cwipc/util.py`.
- `CHANGELOG.md` updated.

Version numbers for the release no longer need to be updated manually, they are generated from the git tag name.

After making all these changes push to github. Ensure the CI/CD build passes. This build will take a looooong time, most likely, because the `vcpkg` dependencies have been updated and the Windows runner will have to rebuild the world.

Now do a nightly build, using `scripts/nightly.sh`.
After making all these changes push to github. Ensure the CI/CD build passes (easiest is by running `./scripts/nightly.sh` which does a nightly build). This build will take a looooong time, most likely, because the `vcpkg` dependencies have been updated and the Windows runner will have to rebuild the world.

After that tag all submodules and the main module with *v_X_._Y_._Z_*.

If one of the next steps fails just fix the issue and do another micro-release. Has happened to me every single release, I think:-)

Push the tag to github, this will build the release.

After the release is built copy the relevant new section of `CHANGELOG.md` to the release notes.
Expand Down

0 comments on commit 8a7d310

Please sign in to comment.