-
Notifications
You must be signed in to change notification settings - Fork 54
ci: Roll NetBSD releases to 11.0, drop 9.4 #321
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,10 +17,16 @@ jobs: | |
| # Test all supported releases. | ||
| # See https://www.netbsd.org/releases/. | ||
| include: | ||
| - release: 9.4 | ||
| capnproto-cppflags: 'CPPFLAGS="-DKJ_NO_EXCEPTIONS=0 -DKJ_USE_KQUEUE=0"' | ||
| - release: 10.1 | ||
| # Due to a bug in Cap'n Proto, GCC compilers older | ||
| # than 14.x require `-DKJ_NO_EXCEPTIONS=0` when | ||
| # processing `capnproto/c++/src/kj/common.h`. | ||
| # See https://github.com/capnproto/capnproto/pull/2756/changes/28fa1a6753514d8de56875ec2222fa0e1c3a04f7. | ||
| - release: '10.1' | ||
| capnproto-cppflags: 'CPPFLAGS="-DKJ_NO_EXCEPTIONS=0"' | ||
| env_vars: 'CXXFLAGS="-DKJ_NO_EXCEPTIONS=0"' | ||
| - release: '11.0' | ||
| capnproto-cppflags: 'CPPFLAGS="-DKJ_NO_EXCEPTIONS=0"' | ||
| env_vars: 'CXXFLAGS="-DKJ_NO_EXCEPTIONS=0"' | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In commit "ci: Switch to default compiler on NetBSD 9.4" (2d33b14) I was confused by inconsistency here between CPPFLAGS and CXXFLAGS but apparently this is needed because cmake ignores uses CXXFLAGS and ignores CPPFLAGS |
||
| steps: | ||
| - uses: actions/checkout@v6 | ||
|
|
||
|
|
@@ -63,7 +69,7 @@ jobs: | |
| - name: Run CI script | ||
| run: | | ||
| cd ${{ github.workspace }} | ||
| CI_CONFIG="ci/configs/netbsd.bash" bash ci/scripts/ci.sh | ||
| CI_CONFIG="ci/configs/netbsd.bash" ${{ matrix.env_vars }} bash ci/scripts/ci.sh | ||
|
|
||
| build-openbsd: | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,5 @@ | ||
| CI_DESC="CI config for NetBSD" | ||
| CI_DIR=build-netbsd | ||
| export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter" | ||
| # Hardcode GCC 14, since default GCC versions installed by NetBSD are older | ||
| # and may not be compatible with libmultiprocess. GCC 14 was chosen because | ||
| # it's the latest compiler available on all versions of NetBSD that we test. | ||
| # Note that the GCC version specified here must match the version specified | ||
| # in pkg_add in ci.yml. | ||
| export CXX="/usr/pkg/gcc14/bin/g++" | ||
| export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter ${CXXFLAGS:-}" | ||
| CMAKE_ARGS=(-G Ninja) | ||
| BUILD_ARGS=(-k 0) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In commit "ci: Switch to default compiler on NetBSD 9.4" (2d33b14)
It'd be nice if commit message said what motivation was for this change. It seems like this is switching to an older compiler and adding a workaround only needed in the older compiler. Unclear why this is better than just using the newer compiler.
EDIT: Looking at next commit, reason for doing this seems to be newer netbsd version added in next commit that maybe doesn't support GCC 14, or maybe defaults to a newer version that would be preferred for wider coverage?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I presume the rationale is that the default compiler is more likely used (by default), so documenting the workaround for it seems fine.
However, using GCC 14, or anything else, will work equally as a workaround and seems fine as well.