merge: Merge branch 'develop' into feature/add-cdl-support

Merging in develop changes

Signed-off-by: Tyler Erickson <[email protected]>

# Conflicts:
#	.cirrus.yml
#	.gitattributes
#	.github/workflows/vmactions.yml
#	meson.build

Author: vonericsen

.cirrus.yml

@@ -5,9 +5,9 @@ task:
     GITHUB_TOKEN: ENCRYPTED[!805e0ec3f027150880429055bbe8c175ccb7894d5a62e10935f15c90557bfaff2a004d6184ca88cb00c690fedf7d6134!]
   freebsd_instance:
     matrix:
-      image_family: freebsd-14-2
+      #image_family: freebsd-15-0
+      image_family: freebsd-14-3
       image_family: freebsd-13-5
-      image_family: freebsd-13-4
   install_script: pkg install -y git meson cmake ntp
   submodules_script: git submodule update --init --recursive --progress
   release_script: |
@@ -22,10 +22,11 @@ task:
     meson install -C build
     cd $CIRRUS_WORKING_DIR/output
     tar cvfJ $CIRRUS_WORKING_DIR/"openSeaChest-$branchName-$(uname -s)-$(uname -r)-$(uname -m).tar.xz" *
-    $CIRRUS_WORKING_DIR/cirrus_ci_post_freebsd_release.sh
+    # Removing upload to use the VMActions freebsd build instead so we also get SLSA provenance.
+    # $CIRRUS_WORKING_DIR/cirrus_ci_post_freebsd_release.sh
   binaries_artifacts:
     path: openSeaChest-*.tar.xz
-    
+
 
 task:
   name: windowsservercore:visualstudio2019

.editorconfig

@@ -0,0 +1,129 @@
+# SPDX-License-Identifier: MPL-2.0
+# See https://spec.editorconfig.org/
+# See https://editorconfig.org/
+
+root = true
+
+# Rules for all files
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+spelling_language = en-US
+
+# Rules for C and C++ source files
+[*.{c, h, cpp, hpp}]
+indent_style = space
+indent_size = 4
+# Do not specify line endings since git's checkout will set to system's native value
+end_of_line = unset
+
+# Microsoft resource files
+[*.rc]
+indent_style = space
+indent_size = 4
+charset = utf-8-bom
+end_of_line = crlf
+
+# Rules for Makefiles
+[Makefile,GNUMakefile,GNUmakefile,Makefile.gccWin]
+indent_style = tab
+end_of_line = lf
+
+# Shell script rules
+[*.sh]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+
+# Batch files
+[*.{bat, cmd}]
+end_of_line = crlf
+charset = utf-8-bom
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# Powershell scripts
+[*.ps1]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+charset = utf-8-bom
+
+# Clang format and tidy configuration files
+[.clang-format]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+
+[.clang-tidy]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+
+# Configuration/CI/YAML/JSON/XML files
+[*.{yaml,yml,xml,json,whitesource,ini,cfg,toml,conf}]
+indent_style = space
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+
+# Markdown files
+[*.md]
+indent_style = space
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = false
+
+# Git configuration files
+[.{gitattributes,gitignore,gitmodules}]
+indent_style = space
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+
+# Generic text files
+[*.txt]
+indent_style = space
+indent_size = 2
+charset = utf-8
+end_of_line = crlf   # For Windows compatibility when editors don't understand unix line endings
+
+# Visual studio
+[*.{vcxproj,csproj,sln,vcxproj.filters}]
+indent_style = space
+indent_size = 2
+charset = utf-8-bom
+end_of_line = crlf
+
+# UEFI build files
+[*.{dec,dsc,inf}]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+
+# Python files
+[*.py]
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+
+# Meson build files
+[meson.build,meson_options.txt,meson.options]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+max_line_length = 120
+insert_final_newline = true
+tab_width = 4
+
+# Meson subproject wrappers
+[*.wrap]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8