fmt, fix ubuntu-old, add some debug info for the current ubuntu

MaterializeInc · Jun 10, 2024 · 5cf2ee9 · 5cf2ee9
1 parent c40edf2
commit 5cf2ee9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
             os: ubuntu-latest
             rust: stable
           - build: ubuntu-old
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             rust: stable
           - build: macos
             os: macos-latest
@@ -29,6 +29,7 @@ jobs:
     - uses: actions/checkout@v1
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
+    - run: clang --version
     - run: cargo test
 
   lint:

diff --git a/protobuf-native/src/compiler.h b/protobuf-native/src/compiler.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include "google/protobuf/compiler/importer.h"
-
 #include "rust/cxx.h"
 
 namespace protobuf_native {

diff --git a/protobuf-native/src/io.h b/protobuf-native/src/io.h
@@ -15,13 +15,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
-
-#include <memory>
-
 #include "rust/cxx.h"
 
 namespace protobuf_native {

diff --git a/protobuf-native/src/lib.h b/protobuf-native/src/lib.h
@@ -15,11 +15,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor.pb.h"
 
-#include <memory>
-
 using namespace google::protobuf;
 
 namespace protobuf_native {