Skip to content

Commit

Permalink
Merge branch '0.10' into 0.10-c11-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
peternewman committed Dec 10, 2023
2 parents 35c035e + 8142298 commit 0270390
Show file tree
Hide file tree
Showing 17 changed files with 85 additions and 83 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
pkg: "gcc g++"
- id: "distcheck-debian-stable-amd64-gcc"
task: "distcheck"
configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests --enable-java-libs"
configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests"
# TODO(Perry): Fix Debian 12 OOM issue on GitHub Actions
container: "debian:stable"
compiler:
Expand All @@ -30,7 +30,7 @@ jobs:
pkg: "gcc g++"
- id: "distcheck-debian-stable-amd64-clang"
task: "distcheck"
configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests --enable-java-libs"
configure-args: "--enable-ja-rule --enable-e133 --enable-rdm-tests"
# TODO(Perry): Fix Debian 12 OOM issue on GitHub Actions
container: "debian:stable"
compiler:
Expand All @@ -50,13 +50,13 @@ jobs:
run: apt-get update -y
# See comments beginning at
# https://github.com/actions/runner/issues/763#issuecomment-1435474884
# Without Git, actions/checkout@v3 will resort to REST and will not
# Without Git, actions/checkout@v4 will resort to REST and will not
# create a .git folder or .git.config. The Problem Matcher looks for
# .git/config to find where the root of the repo is, so it must be
# present.
- name: Install Git
run: apt-get -y install git
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install build tools
shell: bash
run: |
Expand Down Expand Up @@ -90,17 +90,18 @@ jobs:
- name: Autoreconf
run: sudo --preserve-env -u builduser env "PATH=$PATH" autoreconf -i
- name: Set configure arguments
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
run: |
echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
- name: Set additional Linux configure arguments
if: runner.os == 'Linux'
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
run: |
echo "GH_OLA_CONFIGURE_ARGS=$GH_OLA_CONFIGURE_ARGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
- name: Print configure command
run: echo "./configure $GH_OLA_CONFIGURE_ARGS"
run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS"
- name: Configure
run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $GH_OLA_CONFIGURE_ARGS
run: sudo --preserve-env -u builduser env "PATH=$PATH" ./configure $DISTCHECK_CONFIGURE_FLAGS
- name: ${{ matrix.task }}
run: sudo --preserve-env -u builduser env "PATH=$PATH" make ${{ matrix.task }} -j${{ steps.num-cpu-cores.outputs.NUM_CPU_CORES }} VERBOSE=1
- name: Display structure of the built files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
run: apt-get update -y
# See comments beginning at
# https://github.com/actions/runner/issues/763#issuecomment-1435474884
# Without Git, actions/checkout@v3 will resort to REST and will not
# Without Git, actions/checkout@v4 will resort to REST and will not
# create a .git folder or .git.config. The Problem Matcher looks for
# .git/config to find where the root of the repo is, so it must be
# present.
- name: Install Git
run: apt-get -y install git
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install build tools
run: apt-get -y install devscripts adduser fakeroot sudo
- name: Install build dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/isort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ jobs:
isort:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: isort/isort-action@v1
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
run: apt-get update -y
# See comments beginning at
# https://github.com/actions/runner/issues/763#issuecomment-1435474884
# Without Git, actions/checkout@v3 will resort to REST and will not
# Without Git, actions/checkout@v4 will resort to REST and will not
# create a .git folder or .git.config. The Problem Matcher looks for
# .git/config to find where the root of the repo is, so it must be
# present.
- name: Install Git
run: apt-get -y install git
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install build tools
shell: bash
run: |
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
name: weblint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node.js v18
uses: actions/setup-node@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ elif [[ $TASK = 'flake8' ]]; then
make flake8
else
# Otherwise compile and check as normal
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
Expand Down
2 changes: 1 addition & 1 deletion README.developer
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The release lifecycle is:
- New feature work occurs on the master branch.
- Once the new features are considered stable or enough time has passed, a new
minor release branch will be created, e.g. 0.10.
- The minor release branch will be stablized with bugfixes, these bug fixes
- The minor release branch will be stabilized with bugfixes, these bug fixes
will also be merged back into master.
- Once declared stable, a new patch branch 0 will be created e.g. 0.10.0
- Release specific changes like the version number, debian files etc. will be
Expand Down
2 changes: 1 addition & 1 deletion common/web/SchemaParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class SchemaParser : public JsonParserInterface {
/**
* @brief Claim the RootValidator that was created by parsing the schema.
* @returns A new Validator, or NULL if the schema wasn't valid. Ownership of
* the validtor is transferred to the caller.
* the validator is transferred to the caller.
*/
ValidatorInterface* ClaimRootValidator();

Expand Down
2 changes: 1 addition & 1 deletion include/ola/io/MemoryBlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class MemoryBlock {

/**
* @brief Move the insertation point to the end of the block.
* This is useful if you want to use the block in pre-pend mode.
* This is useful if you want to use the block in prepend mode.
*/
void SeekBack() {
m_first = m_data_end;
Expand Down
2 changes: 1 addition & 1 deletion include/ola/network/HealthCheckedConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class HealthCheckedConnection {

/**
* Call this when a heartbeat is piggybacked on another message. This
* prevents sending heatbeats unless necessary.
* prevents sending heartbeats unless necessary.
*/
void HeartbeatSent();

Expand Down
2 changes: 1 addition & 1 deletion include/ola/rdm/StringMessageBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @addtogroup rdm_helpers
* @{
* @file include/ola/rdm/StringMessageBuilder.h
* @brief Builds a Messagse object from a list of strings and a Descriptor.
* @brief Builds a Message object from a list of strings and a Descriptor.
* @}
*/

Expand Down

0 comments on commit 0270390

Please sign in to comment.