Skip to content

Commit

Permalink
Format with clang 18 requires ubuntu 24.04
Browse files Browse the repository at this point in the history
Also cleaned up some unused imports.
  • Loading branch information
shuhaowu committed Jul 18, 2024
1 parent 60a547f commit 70dc51d
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 15 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: cactus-rt

jobs:
build-and-test:
runs-on: [self-hosted, jammy, real-time]
runs-on: [self-hosted, noble, real-time]
env:
CACTUS_RT_BUILD_DIR: build
steps:
Expand All @@ -29,7 +29,7 @@ jobs:
# run: docker/scripts/04-example.sh

build-and-test-no-tracing:
runs-on: [self-hosted, jammy, real-time]
runs-on: [self-hosted, noble, real-time]
env:
CACTUS_RT_BUILD_DIR: build
ENABLE_TRACING: "OFF"
Expand All @@ -53,4 +53,3 @@ jobs:

# - name: Run example
# run: docker/scripts/04-example.sh

2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy
FROM ubuntu:noble

RUN set -xe; \
export DEBIAN_FRONTEND=noninteractive; \
Expand Down
2 changes: 1 addition & 1 deletion examples/lockless_example/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct Context {
*/
class RTThread : public CyclicThread {
Context& ctx_;
Pose current_target_pose_ = {};
Pose current_target_pose_;

static cactus_rt::CyclicThreadConfig CreateThreadConfig() {
cactus_rt::CyclicThreadConfig thread_config;
Expand Down
1 change: 0 additions & 1 deletion include/cactus_rt/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <quill/Quill.h>

#include <memory>
#include <string>

#include "cactus_rt/scheduler.h"

Expand Down
1 change: 0 additions & 1 deletion include/cactus_rt/thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "config.h"
#include "quill/Quill.h"
#include "tracing/thread_tracer.h"
#include "tracing/trace_aggregator.h"

namespace cactus_rt {

Expand Down
2 changes: 0 additions & 2 deletions include/cactus_rt/tracing/track_event_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#ifdef CACTUS_RT_TRACING_ENABLED
#include <cstdint>
#include <optional>
#include <variant>

#include "track_event.pb.h"

Expand Down
2 changes: 0 additions & 2 deletions src/cactus_rt/cyclic_thread.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "cactus_rt/cyclic_thread.h"

#include "cactus_rt/scheduler.h"

namespace cactus_rt {

void CyclicThread::Run() noexcept {
Expand Down
2 changes: 0 additions & 2 deletions src/cactus_rt/thread.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@
#include <cerrno>
#include <cstring>
#include <ctime>
#include <iostream>
#include <stdexcept>

#include "cactus_rt/app.h"
#include "cactus_rt/config.h"
#include "cactus_rt/linux/sched_ext.h"

namespace cactus_rt {

Expand Down
2 changes: 0 additions & 2 deletions src/cactus_rt/tracing/thread_tracer.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "cactus_rt/tracing/thread_tracer.h"

#include <mutex>

#include "cactus_rt/tracing/tracing_enabled.h"
#include "cactus_rt/utils.h"

Expand Down

0 comments on commit 70dc51d

Please sign in to comment.