Update runners (#374)

andiwand · web-flow · commit 8e44d053584f · 2024-07-07T13:33:37.000+02:00
diff --git a/.github/config/macos-13-clang-14/conan/profiles/default b/.github/config/macos-13-clang-14/conan/profiles/default
diff --git a/.github/config/macos-14-clang-14/conan/profiles/default b/.github/config/macos-14-clang-14/conan/profiles/default
@@ -0,0 +1,8 @@
+[settings]
+arch=x86_64
+build_type=Release
+compiler=apple-clang
+compiler.version=14
+compiler.cppstd=17
+compiler.libcxx=libc++
+os=Macos
diff --git a/.github/config/ubuntu-24.04-clang-16/conan/profiles/default b/.github/config/ubuntu-24.04-clang-16/conan/profiles/default
@@ -2,10 +2,10 @@
 arch=x86_64
 build_type=Release
 compiler=clang
-compiler.version=15
+compiler.version=16
 compiler.cppstd=17
 compiler.libcxx=libstdc++11
 os=Linux
 
 [conf]
-tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
+tools.build:compiler_executables={'c': 'clang-16', 'cpp': 'clang++-16'}
diff --git a/.github/config/ubuntu-24.04-gcc-12/conan/profiles/default b/.github/config/ubuntu-24.04-gcc-12/conan/profiles/default
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -22,9 +22,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
-          - { os: ubuntu-22.04, compiler: gcc-12 }
-          - { os: macos-12, compiler: clang-14 }
+          - { os: ubuntu-24.04, compiler: clang-16 }
+          - { os: ubuntu-24.04, compiler: gcc-12 }
+          - { os: macos-13, compiler: clang-14 }
+          - { os: macos-14, compiler: clang-14 }
           - { os: windows-2022, compiler: msvc-1939 }
     steps:
       - name: checkout
@@ -100,7 +101,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
+          - { os: ubuntu-24.04, compiler: clang-16 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -157,8 +158,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
-          - { os: macos-12, compiler: clang-14 }
+          - { os: ubuntu-24.04, compiler: clang-16 }
+          - { os: macos-14, compiler: clang-14 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -218,9 +219,10 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
-          - { os: ubuntu-22.04, compiler: gcc-12 }
-          - { os: macos-12, compiler: clang-14 }
+          - { os: ubuntu-24.04, compiler: clang-16 }
+          - { os: ubuntu-24.04, compiler: gcc-12 }
+          - { os: macos-13, compiler: clang-14 }
+          - { os: macos-14, compiler: clang-14 }
           - { os: windows-2022, compiler: msvc-1939 }
     steps:
       - name: checkout
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test_image:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       packages: write
     steps:
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -8,16 +8,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout
         uses: actions/checkout@v4
 
-      - run: clang-format-15 --version
-
       - name: apply clang-format
-        run: |
-          FILES=$( find . -type f \( -iname \*.h -o -iname \*.cpp \) )
-          clang-format-15 --style=file -i $FILES
+        run: CLANG_FORMAT=clang-format-18 ./scripts/format
 
       - run: git diff --exit-code --name-only
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
+          - { os: ubuntu-24.04, compiler: clang-15 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-22.04, compiler: clang-15 }
+          - { os: ubuntu-24.04, compiler: clang-16 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
diff --git a/scripts/format b/scripts/format
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
+
+echo "Running clang-format on all .hpp and .cpp files in the project"
+echo "Using clang-format: ${CLANG_FORMAT}"
+
+${CLANG_FORMAT} --version
+
+function format_file() {
+    echo "Formatting $1"
+    ${CLANG_FORMAT} --style=file -i $1
+}
+function format_folder() {
+  export -f format_file
+  export CLANG_FORMAT
+  find $1 -type f \( -iname \*.hpp -o -iname \*.cpp \) -exec bash -c 'format_file "${1}"' -- {} \;
+}
+
+format_folder src
+format_folder cli
+format_folder test/src
diff --git a/src/odr/html.cpp b/src/odr/html.cpp
@@ -22,8 +22,8 @@ namespace fs = std::filesystem;
 namespace odr {
 
 Html::Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages)
-    : m_file_type{file_type}, m_config{std::move(config)}, m_pages{std::move(
-                                                               pages)} {}
+    : m_file_type{file_type}, m_config{std::move(config)},
+      m_pages{std::move(pages)} {}
 
 Html::Html(FileType file_type, HtmlConfig config, std::vector<HtmlPage> pages,
            Document document)
diff --git a/src/odr/internal/cfb/cfb_impl.cpp b/src/odr/internal/cfb/cfb_impl.cpp
@@ -26,10 +26,10 @@ bool CompoundFileEntry::is_stream() const { return type == 2; }
 
 CompoundFileReader::CompoundFileReader(const void *buffer,
                                        const std::size_t len)
-    : m_buffer{static_cast<const std::uint8_t *>(buffer)},
-      m_buffer_len{len}, m_hdr{static_cast<const CompoundFileHeader *>(buffer)},
-      m_sector_size{512}, m_mini_sector_size{64}, m_mini_stream_start_sector{
-                                                      0} {
+    : m_buffer{static_cast<const std::uint8_t *>(buffer)}, m_buffer_len{len},
+      m_hdr{static_cast<const CompoundFileHeader *>(buffer)},
+      m_sector_size{512}, m_mini_sector_size{64},
+      m_mini_stream_start_sector{0} {
   if (buffer == nullptr || len == 0) {
     throw std::invalid_argument("");
   }
diff --git a/src/odr/internal/cfb/cfb_util.cpp b/src/odr/internal/cfb/cfb_util.cpp
@@ -41,8 +41,8 @@ class FileInCfbIstream final : public std::istream {
 
 FileInCfbIstream::FileInCfbIstream(std::shared_ptr<Archive> archive,
                                    std::unique_ptr<util::ReaderBuffer> sbuf)
-    : std::istream(sbuf.get()), m_archive{std::move(archive)}, m_sbuf{std::move(
-                                                                   sbuf)} {}
+    : std::istream(sbuf.get()), m_archive{std::move(archive)},
+      m_sbuf{std::move(sbuf)} {}
 
 FileInCfbIstream::FileInCfbIstream(std::shared_ptr<Archive> archive,
                                    const impl::CompoundFileReader &reader,
diff --git a/src/odr/internal/common/temporary_file.cpp b/src/odr/internal/common/temporary_file.cpp
@@ -42,8 +42,8 @@ TemporaryDiskFileFactory::default_random_file_name_generator() {
 
 TemporaryDiskFileFactory::TemporaryDiskFileFactory(
     common::Path directory, RandomFileNameGenerator random_file_name_generator)
-    : m_directory{std::move(directory)}, m_random_file_name_generator{
-                                             random_file_name_generator} {}
+    : m_directory{std::move(directory)},
+      m_random_file_name_generator{random_file_name_generator} {}
 
 TemporaryDiskFile
 TemporaryDiskFileFactory::copy(const abstract::File &file) const {
diff --git a/src/odr/internal/odf/odf_spreadsheet.cpp b/src/odr/internal/odf/odf_spreadsheet.cpp
@@ -57,8 +57,8 @@ class SheetCell final : public Element, public abstract::SheetCell {
 public:
   SheetCell(pugi::xml_node node, std::uint32_t column, std::uint32_t row,
             bool is_repeated)
-      : Element(node), m_column{column}, m_row{row}, m_is_repeated{
-                                                         is_repeated} {}
+      : Element(node), m_column{column}, m_row{row},
+        m_is_repeated{is_repeated} {}
 
   [[nodiscard]] bool is_covered(const abstract::Document *) const final {
     return std::strcmp(m_node.name(), "table:covered-table-cell") == 0;
diff --git a/src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp b/src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp
@@ -66,8 +66,8 @@ Element::document_relations_(const abstract::Document *document) const {
 Root::Root(pugi::xml_node node, common::Path document_path,
            const Relations &document_relations)
     : DefaultElement(node, document_path, document_relations),
-      m_document_path{std::move(document_path)}, m_document_relations{
-                                                     document_relations} {}
+      m_document_path{std::move(document_path)},
+      m_document_relations{document_relations} {}
 
 const common::Path &Root::document_path_(const abstract::Document *) const {
   return m_document_path;
@@ -122,8 +122,8 @@ pugi::xml_node SheetIndex::cell(std::uint32_t column, std::uint32_t row) const {
 Sheet::Sheet(pugi::xml_node node, common::Path document_path,
              const Relations &document_relations)
     : Element(node, document_path, document_relations),
-      m_document_path{std::move(document_path)}, m_document_relations{
-                                                     document_relations} {}
+      m_document_path{std::move(document_path)},
+      m_document_relations{document_relations} {}
 
 const common::Path &Sheet::document_path_(const abstract::Document *) const {
   return m_document_path;
@@ -300,8 +300,8 @@ std::string Text::text_(const pugi::xml_node node) {
 Frame::Frame(pugi::xml_node node, common::Path document_path,
              const Relations &document_relations)
     : Element(node, document_path, document_relations),
-      m_document_path{std::move(document_path)}, m_document_relations{
-                                                     document_relations} {}
+      m_document_path{std::move(document_path)},
+      m_document_relations{document_relations} {}
 
 const common::Path &Frame::document_path_(const abstract::Document *) const {
   return m_document_path;
diff --git a/src/odr/internal/zip/zip_util.cpp b/src/odr/internal/zip/zip_util.cpp
@@ -67,8 +67,8 @@ int ReaderBuffer::underflow() {
 
 FileInZipIstream::FileInZipIstream(std::shared_ptr<Archive> archive,
                                    std::unique_ptr<ReaderBuffer> sbuf)
-    : std::istream(sbuf.get()), m_archive{std::move(archive)}, m_sbuf{std::move(
-                                                                   sbuf)} {}
+    : std::istream(sbuf.get()), m_archive{std::move(archive)},
+      m_sbuf{std::move(sbuf)} {}
 
 FileInZipIstream::FileInZipIstream(std::shared_ptr<Archive> archive,
                                    mz_zip_reader_extract_iter_state *iter)
diff --git a/test/src/test_util.cpp b/test/src/test_util.cpp
@@ -106,8 +106,8 @@ std::unordered_map<std::string, TestFile> get_test_files() {
 
 TestFile::TestFile(std::string path, const FileType type,
                    const bool password_encrypted, std::string password)
-    : path{std::move(path)}, type{type},
-      password_encrypted{password_encrypted}, password{std::move(password)} {}
+    : path{std::move(path)}, type{type}, password_encrypted{password_encrypted},
+      password{std::move(password)} {}
 
 std::string TestData::data_input_directory() {
   return common::Path(TestData::data_directory()).join("input").string();
