Merge branch 'main' into rfc-9651/raw-support-for-display-string

clintonpi · web-flow · commit f618c1c4a136 · 2024-11-20T10:21:46.000Z
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -23,8 +23,3 @@ jobs:
     cxx-interop:
         name: Cxx interop
         uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
-
-    swift-6-language-mode:
-        name: Swift 6 Language Mode
-        uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main
-        if: false  # Disabled for now.
diff --git a/scripts/generate_contributors_list.sh b/scripts/generate_contributors_list.sh
