Skip to content

Commit

Permalink
fix pre-commit ci fix
Browse files Browse the repository at this point in the history
  • Loading branch information
farhangnaderi committed Nov 18, 2024
1 parent 536fe08 commit 009ad16
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ros1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
with:
package-name: plotjuggler
package-name: plotjuggler
2 changes: 1 addition & 1 deletion .github/workflows/ros2-rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
with:
package-name: plotjuggler
package-name: plotjuggler
2 changes: 1 addition & 1 deletion .github/workflows/ros2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
with:
package-name: plotjuggler
package-name: plotjuggler
6 changes: 1 addition & 5 deletions .github/workflows/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ jobs:
libqt5x11extras5-dev \
libprotoc-dev \
libzmq3-dev \
liblz4-dev libzstd-dev
liblz4-dev libzstd-dev
- name: Build Plotjuggler
run: |
cmake -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
cmake --build build --target install
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
3 changes: 0 additions & 3 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,3 @@ jobs:
run: >
cmake -Ax64 -T host=x64 -B build -DCMAKE_INSTALL_PREFIX=install PlotJuggler;
cmake --build build --target install
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
1 change: 0 additions & 1 deletion cmake/FindZeroMQ.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ include ( FindPackageHandleStandardArgs )
# handle the QUIETLY and REQUIRED arguments and set ZeroMQ_FOUND to TRUE
# if all listed variables are TRUE
find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR )

2 changes: 1 addition & 1 deletion installer/io.plotjuggler.application/meta/installscript.qs
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ Component.prototype.componentSelectionPageEntered = function()
if (installer.fileExists(dir) && installer.fileExists(dir + "/maintenancetool.exe")) {
installer.execute(dir + "/maintenancetool.exe", ["purge", "-c"]);
}
}
}
2 changes: 1 addition & 1 deletion installer/io.plotjuggler.application/meta/targetwidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@
</widget>
<resources/>
<connections/>
</ui>
</ui>
2 changes: 1 addition & 1 deletion plotjuggler_plugins/ParserProtobuf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ if( Protobuf_FOUND)
install(TARGETS ProtobufParser DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY} )
else()
message("[Protobuf] not found: skipping compilatiopn of plugin ProtobufParser")
endif()
endif()
6 changes: 2 additions & 4 deletions plotjuggler_plugins/ParserProtobuf/error_collectors.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ class IoErrorCollector : public google::protobuf::io::ErrorCollector
class FileErrorCollector : public google::protobuf::compiler::MultiFileErrorCollector
{
public:
void AddError(const std::string& filename, int line, int,
const std::string& message);
void AddError(const std::string& filename, int line, int, const std::string& message);

void AddWarning(const std::string& filename, int line, int,
const std::string& message);
void AddWarning(const std::string& filename, int line, int, const std::string& message);

const QStringList& errors()
{
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
]
}
]
}
}

0 comments on commit 009ad16

Please sign in to comment.