From 7e79607c19aea8acba4d4984d780ab327e7f30d9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 18 Jul 2023 04:15:16 +0100 Subject: [PATCH 01/11] Fix distcheck configure args --- .github/workflows/build.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 554baa985..d41e260de 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -92,11 +92,19 @@ jobs: - name: Set configure arguments run: | echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV + - name: Set distcheck configure arguments + if: matrix.task == 'distcheck' + run: | + 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 + - name: Set additional Linux distcheck configure arguments + if: matrix.task == 'distcheck' + run: | + echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - name: Print configure command run: echo "./configure $GH_OLA_CONFIGURE_ARGS" - name: Configure From 38bd9de6638abb504326c6e4f2062b46beffa5db Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Wed, 26 Jul 2023 16:31:03 -0400 Subject: [PATCH 02/11] fix ci java build using correct autotools env var (closes #1883) --- .github/workflows/build.yaml | 11 ++++------- .travis-ci.sh | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d41e260de..9b68ec257 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -90,25 +90,22 @@ jobs: - name: Autoreconf run: sudo --preserve-env -u builduser env "PATH=$PATH" autoreconf -i - name: Set configure arguments - run: | - echo "GH_OLA_CONFIGURE_ARGS=${{ matrix.configure-args }}" >> $GITHUB_ENV - - name: Set distcheck configure arguments - if: matrix.task == 'distcheck' + # Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883 run: | 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: Set additional Linux distcheck configure arguments if: matrix.task == 'distcheck' run: | echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} 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 diff --git a/.travis-ci.sh b/.travis-ci.sh index fc9bd59e7..f76f7b72e 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -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' From b153941f80f814c5d38173f76d2d61735a4cfcfa Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Thu, 27 Jul 2023 10:09:35 -0400 Subject: [PATCH 03/11] fix codespell typos --- README.developer | 2 +- plugins/artnet/ArtNetNodeTest.cpp | 106 +++++++++++++++--------------- tools/rdm/rdm_test_server.py | 2 +- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/README.developer b/README.developer index e989e800d..309ad07a9 100644 --- a/README.developer +++ b/README.developer @@ -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 diff --git a/plugins/artnet/ArtNetNodeTest.cpp b/plugins/artnet/ArtNetNodeTest.cpp index 16960da26..53b62350f 100644 --- a/plugins/artnet/ArtNetNodeTest.cpp +++ b/plugins/artnet/ArtNetNodeTest.cpp @@ -211,7 +211,7 @@ class ArtNetNodeTest: public CppUnit::TestFixture { // This sends a tod data so 7s70:00000000 is insert into the tod void PopulateTod() { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t art_tod[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x81, @@ -646,7 +646,7 @@ void ArtNetNodeTest::testBroadcastSendDMX() { m_socket->SetDiscardMode(false); { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -666,7 +666,7 @@ void ArtNetNodeTest::testBroadcastSendDMX() { // send an odd sized dmx frame, we should pad this to a multiple of two { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -684,14 +684,14 @@ void ArtNetNodeTest::testBroadcastSendDMX() { } { // attempt to send on a invalid port - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); DmxBuffer dmx; dmx.SetFromString("0,1,2,3,4"); OLA_ASSERT_FALSE(node.SendDMX(4, dmx)); } { // attempt to send an empty fram - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); DmxBuffer empty_buffer; OLA_ASSERT(node.SendDMX(m_port_id, empty_buffer)); } @@ -717,7 +717,7 @@ void ArtNetNodeTest::testBroadcastSendDMXZeroUniverse() { m_socket->SetDiscardMode(false); { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -781,7 +781,7 @@ void ArtNetNodeTest::testBroadcastSendDMXZeroUniverse() { } { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -818,7 +818,7 @@ void ArtNetNodeTest::testLimitedBroadcastDMX() { m_socket->SetDiscardMode(false); { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -861,7 +861,7 @@ void ArtNetNodeTest::testNonBroadcastSendDMX() { vector node_addresses; { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t poll_reply_message[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x21, @@ -926,7 +926,7 @@ void ArtNetNodeTest::testNonBroadcastSendDMX() { // add another peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t poll_reply_message2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x21, @@ -980,7 +980,7 @@ void ArtNetNodeTest::testNonBroadcastSendDMX() { // send another DMX frame, this should get unicast twice { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t DMX_MESSAGE2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -999,7 +999,7 @@ void ArtNetNodeTest::testNonBroadcastSendDMX() { // adjust the broadcast threshold { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); node.SetBroadcastThreshold(2); // send another DMX frame, this should get broadcast @@ -1050,7 +1050,7 @@ void ArtNetNodeTest::testReceiveDMX() { // 'receive' a DMX message { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); OLA_ASSERT_FALSE(m_got_dmx); ReceiveFromPeer(DMX_MESSAGE, sizeof(DMX_MESSAGE), peer_ip); OLA_ASSERT(m_got_dmx); @@ -1059,7 +1059,7 @@ void ArtNetNodeTest::testReceiveDMX() { // send a second frame { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t DMX_MESSAGE2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1079,7 +1079,7 @@ void ArtNetNodeTest::testReceiveDMX() { // advance the clock by more than the merge timeout (10s) { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_clock.AdvanceTime(11, 0); // send another message, but first update the seq # @@ -1128,7 +1128,7 @@ void ArtNetNodeTest::testReceiveDMXZeroUniverse() { 0, 6, // dmx length 0, 1, 2, 3, 4, 5 }; - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); OLA_ASSERT_FALSE(m_got_dmx); ReceiveFromPeer(DMX_MESSAGE, sizeof(DMX_MESSAGE), peer_ip); OLA_ASSERT(m_got_dmx); @@ -1158,7 +1158,7 @@ void ArtNetNodeTest::testReceiveDMXZeroUniverse() { 0, 4, // dmx length 10, 11, 12, 13 }; - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); OLA_ASSERT_FALSE(m_got_dmx); ReceiveFromPeer(DMX_MESSAGE, sizeof(DMX_MESSAGE), peer_ip); OLA_ASSERT(m_got_dmx); @@ -1186,7 +1186,7 @@ void ArtNetNodeTest::testHTPMerge() { // 'receive' a DMX message from the first peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1206,7 +1206,7 @@ void ArtNetNodeTest::testHTPMerge() { // receive a message from a second peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source2_message1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1267,7 +1267,7 @@ void ArtNetNodeTest::testHTPMerge() { // send a packet from a third source, this shouldn't result in any new dmx { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t source3_message1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1287,7 +1287,7 @@ void ArtNetNodeTest::testHTPMerge() { // send another packet from the first source { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1312,7 +1312,7 @@ void ArtNetNodeTest::testHTPMerge() { // send another packet from the first source { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message3[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1337,7 +1337,7 @@ void ArtNetNodeTest::testHTPMerge() { // send another packet from the first source { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message4[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1379,7 +1379,7 @@ void ArtNetNodeTest::testLTPMerge() { // switch to LTP merge mode, this will trigger an art poll reply { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t poll_reply_message[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x21, @@ -1422,7 +1422,7 @@ void ArtNetNodeTest::testLTPMerge() { // 'receive' a DMX message from the first peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1442,7 +1442,7 @@ void ArtNetNodeTest::testLTPMerge() { // receive a message from a second peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source2_message1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1506,7 +1506,7 @@ void ArtNetNodeTest::testLTPMerge() { // send another packet from the first source { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); uint8_t source1_message2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x50, @@ -1547,7 +1547,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // send a tod control { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); ExpectedBroadcast(TOD_CONTROL, sizeof(TOD_CONTROL)); node.RunFullDiscovery( m_port_id, @@ -1557,7 +1557,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // advance the clock and run the select server { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_clock.AdvanceTime(5, 0); // tod timeout is 4s ss.RunOnce(); // update the wake up time OLA_ASSERT(m_discovery_done); @@ -1568,7 +1568,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // run discovery again, this time returning a ArtTod from a peer { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_discovery_done = false; ExpectedBroadcast(TOD_CONTROL, sizeof(TOD_CONTROL)); @@ -1602,7 +1602,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // advance the clock and run the select server { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_clock.AdvanceTime(5, 0); // tod timeout is 4s ss.RunOnce(); // update the wake up time OLA_ASSERT(m_discovery_done); @@ -1617,7 +1617,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // run discovery again, removing one UID, and moving another from peer1 // to peer2 { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_discovery_done = false; ExpectedBroadcast(TOD_CONTROL, sizeof(TOD_CONTROL)); @@ -1668,7 +1668,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // advance the clock and run the select server { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_clock.AdvanceTime(5, 0); // tod timeout is 4s ss.RunOnce(); // update the wake up time OLA_ASSERT(m_discovery_done); @@ -1681,7 +1681,7 @@ void ArtNetNodeTest::testControllerDiscovery() { // try running discovery for a invalid port id { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_discovery_done = false; node.RunFullDiscovery( 4, @@ -1708,7 +1708,7 @@ void ArtNetNodeTest::testControllerIncrementalDiscovery() { // send a tod request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t tod_request[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x80, @@ -1733,7 +1733,7 @@ void ArtNetNodeTest::testControllerIncrementalDiscovery() { // respond with a tod { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t art_tod1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x81, @@ -1766,7 +1766,7 @@ void ArtNetNodeTest::testControllerIncrementalDiscovery() { // try running discovery for a invalid port id { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_discovery_done = false; node.RunIncrementalDiscovery( 4, @@ -1797,7 +1797,7 @@ void ArtNetNodeTest::testUnsolicitedTod() { // receive a tod { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); OLA_ASSERT_FALSE(m_discovery_done); // receive a ArtTod @@ -1848,7 +1848,7 @@ void ArtNetNodeTest::testResponderDiscovery() { // receive a tod request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t tod_request[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x80, @@ -1870,7 +1870,7 @@ void ArtNetNodeTest::testResponderDiscovery() { // respond with a Tod { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t art_tod1[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x81, @@ -1897,7 +1897,7 @@ void ArtNetNodeTest::testResponderDiscovery() { // try a tod request a universe that doesn't match ours { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_tod_request = false; const uint8_t tod_request2[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, @@ -1920,7 +1920,7 @@ void ArtNetNodeTest::testResponderDiscovery() { // check TodControl { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); OLA_ASSERT_FALSE(m_tod_flush); const uint8_t tod_control[] = { @@ -1940,7 +1940,7 @@ void ArtNetNodeTest::testResponderDiscovery() { // try a tod control a universe that doesn't match ours { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); m_tod_flush = false; OLA_ASSERT_FALSE(m_tod_flush); const uint8_t tod_control2[] = { @@ -1980,7 +1980,7 @@ void ArtNetNodeTest::testRDMResponder() { ola::NewCallback(this, &ArtNetNodeTest::HandleRDM))); { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t rdm_request[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x83, @@ -2026,7 +2026,7 @@ void ArtNetNodeTest::testRDMResponder() { // run the RDM callback, triggering the response { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t rdm_response[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x83, @@ -2079,7 +2079,7 @@ void ArtNetNodeTest::testRDMRequest() { // create a new RDM request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); SendRDMRequest( &node, ola::NewSingleCallback(this, &ArtNetNodeTest::FinalizeRDM)); @@ -2087,7 +2087,7 @@ void ArtNetNodeTest::testRDMRequest() { // send a response { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t rdm_response[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x83, @@ -2133,7 +2133,7 @@ void ArtNetNodeTest::testRDMRequestTimeout() { // create a new RDM request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); SendRDMRequest( &node, ola::NewSingleCallback(this, &ArtNetNodeTest::ExpectTimeout)); @@ -2163,7 +2163,7 @@ void ArtNetNodeTest::testRDMRequestIPMismatch() { // create a new RDM request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); SendRDMRequest( &node, ola::NewSingleCallback(this, &ArtNetNodeTest::ExpectTimeout)); @@ -2171,7 +2171,7 @@ void ArtNetNodeTest::testRDMRequestIPMismatch() { // send a response from a different IP { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t rdm_response[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x83, @@ -2220,7 +2220,7 @@ void ArtNetNodeTest::testRDMRequestUIDMismatch() { // create a new RDM request { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); SendRDMRequest( &node, ola::NewSingleCallback(this, &ArtNetNodeTest::ExpectTimeout)); @@ -2228,7 +2228,7 @@ void ArtNetNodeTest::testRDMRequestUIDMismatch() { // send a response from a different IP { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t rdm_response[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x83, @@ -2273,7 +2273,7 @@ void ArtNetNodeTest::testTimeCode() { m_socket->SetDiscardMode(false); { - SocketVerifier verifer(m_socket); + SocketVerifier verifier(m_socket); const uint8_t timecode_message[] = { 'A', 'r', 't', '-', 'N', 'e', 't', 0x00, 0x00, 0x97, diff --git a/tools/rdm/rdm_test_server.py b/tools/rdm/rdm_test_server.py index 742768d99..b8196d842 100755 --- a/tools/rdm/rdm_test_server.py +++ b/tools/rdm/rdm_test_server.py @@ -834,7 +834,7 @@ def _CheckValidUniverse(self, request): request: the HTTPRequest object. Returns: - The santitized universe id. + The sanitized universe id. Raises: ServerException if the universe isn't valid or doesn't exist. From 514b05ab4101ab28137a6c92a5de37b10e607986 Mon Sep 17 00:00:00 2001 From: Perry Naseck <4472083+DaAwesomeP@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:14:41 -0400 Subject: [PATCH 04/11] github actions build remove redundant condfigure flags Co-authored-by: Peter Newman --- .github/workflows/build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9b68ec257..1f1ffa913 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -98,10 +98,6 @@ jobs: # Silence all deprecated declarations on Linux due to auto_ptr making the build log too long run: | echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - - name: Set additional Linux distcheck configure arguments - if: matrix.task == 'distcheck' - run: | - echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }} CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV - name: Print configure command run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS" - name: Configure From 50de3e82075cfcaaaa062b9865086913b1c85067 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Thu, 27 Jul 2023 10:16:41 -0400 Subject: [PATCH 05/11] github actions build disable java for now --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1f1ffa913..fb0bfe819 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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: @@ -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: From 51981882ef3a76bd9115aa8074c0680693bdd5e4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 9 Aug 2023 11:54:45 +0100 Subject: [PATCH 06/11] Fix another minor typo --- plugins/artnet/ArtNetNodeTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/artnet/ArtNetNodeTest.cpp b/plugins/artnet/ArtNetNodeTest.cpp index 53b62350f..4212f4996 100644 --- a/plugins/artnet/ArtNetNodeTest.cpp +++ b/plugins/artnet/ArtNetNodeTest.cpp @@ -690,7 +690,7 @@ void ArtNetNodeTest::testBroadcastSendDMX() { OLA_ASSERT_FALSE(node.SendDMX(4, dmx)); } - { // attempt to send an empty fram + { // attempt to send an empty frame SocketVerifier verifier(m_socket); DmxBuffer empty_buffer; OLA_ASSERT(node.SendDMX(m_port_id, empty_buffer)); From 2f8ea5f6c17e0dae2e1587355e6db458558a7d37 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 19 Sep 2023 18:19:50 +0100 Subject: [PATCH 07/11] Fix some more typos Codespell found --- include/ola/io/MemoryBlock.h | 2 +- include/ola/rdm/StringMessageBuilder.h | 2 +- plugins/usbpro/DmxterWidget.cpp | 2 +- plugins/usbpro/DmxterWidget.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ola/io/MemoryBlock.h b/include/ola/io/MemoryBlock.h index 464fdfd77..2a053d52b 100644 --- a/include/ola/io/MemoryBlock.h +++ b/include/ola/io/MemoryBlock.h @@ -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; diff --git a/include/ola/rdm/StringMessageBuilder.h b/include/ola/rdm/StringMessageBuilder.h index 4f08afc85..f66187e68 100644 --- a/include/ola/rdm/StringMessageBuilder.h +++ b/include/ola/rdm/StringMessageBuilder.h @@ -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. * @} */ diff --git a/plugins/usbpro/DmxterWidget.cpp b/plugins/usbpro/DmxterWidget.cpp index aae5f9564..4b061aa3b 100644 --- a/plugins/usbpro/DmxterWidget.cpp +++ b/plugins/usbpro/DmxterWidget.cpp @@ -325,7 +325,7 @@ void DmxterWidgetImpl::HandleRDMResponse(const uint8_t *data, case RC_NACK_FORMAT_ERROR: case RC_NACK_HARDWARE_FAULT: case RC_NACK_PROXY_REJECT: - case RC_NACK_WRITE_PROECT: + case RC_NACK_WRITE_PROTECT: case RC_NACK_COMMAND_CLASS: case RC_NACK_DATA_RANGE: case RC_NACK_BUFFER_FULL: diff --git a/plugins/usbpro/DmxterWidget.h b/plugins/usbpro/DmxterWidget.h index 44cde5672..3e48ef176 100644 --- a/plugins/usbpro/DmxterWidget.h +++ b/plugins/usbpro/DmxterWidget.h @@ -107,7 +107,7 @@ class DmxterWidgetImpl: public BaseUsbProWidget, RC_NACK_FORMAT_ERROR = 25, RC_NACK_HARDWARE_FAULT = 26, RC_NACK_PROXY_REJECT = 27, - RC_NACK_WRITE_PROECT = 28, + RC_NACK_WRITE_PROTECT = 28, RC_NACK_COMMAND_CLASS = 29, RC_NACK_DATA_RANGE = 30, RC_NACK_BUFFER_FULL = 31, From 155d5391cabdd58cd6db58eb8c4771dc8a71f76e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:38:12 +0000 Subject: [PATCH 08/11] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit e85896d4d10e11eb67a95c9c4ec31ffe47111d51) --- .github/workflows/build.yaml | 4 ++-- .github/workflows/debian.yml | 4 ++-- .github/workflows/isort.yml | 2 +- .github/workflows/lint.yaml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fb0bfe819..8408df474 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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: | diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index dbf285ba8..0ae5317ba 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -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 diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml index f314e5b55..9aff6b16d 100644 --- a/.github/workflows/isort.yml +++ b/.github/workflows/isort.yml @@ -8,5 +8,5 @@ jobs: isort: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: isort/isort-action@v1 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 731f617f5..0c49e768a 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -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: | @@ -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: From af3a814e9e297dc07ee8c9e730a0d273698ece80 Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Tue, 10 Oct 2023 16:59:36 -0400 Subject: [PATCH 09/11] fix codespell typo --- common/web/SchemaParser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/web/SchemaParser.h b/common/web/SchemaParser.h index dfbd34f44..ba49dba29 100644 --- a/common/web/SchemaParser.h +++ b/common/web/SchemaParser.h @@ -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(); From 3b18f4e4a24acadfc6f3a092fd427ce7c408c4ce Mon Sep 17 00:00:00 2001 From: Perry Naseck Date: Tue, 10 Oct 2023 17:06:38 -0400 Subject: [PATCH 10/11] fix flake8 errors --- python/ola/StringUtils.py | 6 +++--- tools/rdm/ResponderTest.py | 6 +++--- tools/rdm/TestHelpers.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/ola/StringUtils.py b/python/ola/StringUtils.py index a0f51cfaf..4a4d7dd7d 100644 --- a/python/ola/StringUtils.py +++ b/python/ola/StringUtils.py @@ -32,11 +32,11 @@ def StringEscape(s): """Escape unprintable characters in a string.""" # TODO(Peter): How does this interact with the E1.20 Unicode flag? # We don't use sys.version_info.major to support Python 2.6. - if sys.version_info[0] == 2 and type(s) == str: + if sys.version_info[0] == 2 and isinstance(s, str): return s.encode('string-escape') - elif sys.version_info[0] == 2 and type(s) == unicode: + elif sys.version_info[0] == 2 and isinstance(s, unicode): return s.encode('unicode-escape') - elif type(s) == str: + elif isinstance(s, str): # All strings in Python 3 are unicode # This encode/decode pair gets us an escaped string return s.encode('unicode-escape').decode(encoding="ascii", diff --git a/tools/rdm/ResponderTest.py b/tools/rdm/ResponderTest.py index 93490306f..23a6f532d 100644 --- a/tools/rdm/ResponderTest.py +++ b/tools/rdm/ResponderTest.py @@ -612,15 +612,15 @@ def _CheckForAckOrNack(self, response, unpacked_data, unpack_exception): return True def _EscapeData(self, data): - if type(data) == list: + if isinstance(data, list): return [self._EscapeData(i) for i in data] - elif type(data) == dict: + elif isinstance(data, dict): d = {} for k, v in data.items(): # We can't escape the key as then it may become a new key d[k] = self._EscapeData(v) return d - elif type(data) == str or type(data) == unicode: + elif isinstance(data, str) or isinstance(data, unicode): return StringEscape(data) else: return data diff --git a/tools/rdm/TestHelpers.py b/tools/rdm/TestHelpers.py index 51eb606de..4a157bcf6 100644 --- a/tools/rdm/TestHelpers.py +++ b/tools/rdm/TestHelpers.py @@ -31,7 +31,7 @@ def ContainsUnprintable(s): """Check if a string s contain unprintable characters.""" # TODO(Peter): How does this interact with the E1.20 Unicode flag? - if type(s) == str or type(s) == unicode: + if isinstance(s, str) or isinstance(s, unicode): # All strings in Python 3 are unicode, Python 2 ones might not be return s != StringEscape(s) else: From 27b40d2d38c4d6fe963cd7c93a54b984d555b8cc Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 28 Oct 2023 15:02:49 +0100 Subject: [PATCH 11/11] Fix a typo --- include/ola/network/HealthCheckedConnection.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ola/network/HealthCheckedConnection.h b/include/ola/network/HealthCheckedConnection.h index a4311f51e..cbbe33e35 100644 --- a/include/ola/network/HealthCheckedConnection.h +++ b/include/ola/network/HealthCheckedConnection.h @@ -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();