Merge branch 'main' into refactor/consolidate-manifest-validation

Author: tomerd

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+name: Bug Report
+description: Something isn't working as expected
+labels: [bug]
+body:
+- type: textarea
+  attributes:
+    label: Description
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: What you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Actual behavior
+    description: What actually happened.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    placeholder: |
+      1. ...
+      2. ...
+  validations:
+    required: false
+- type: input
+  attributes:
+    label: Swift Package Manager version/commit hash
+  validations:
+    required: false 
+- type: textarea
+  attributes:
+    label: Swift & OS version (output of `swift --version && uname -a`)
+  validations:
+    required: false 

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,39 @@
+name: Feature Request
+description: A suggestion for a new feature
+labels: [enhancement]
+body:
+- type: textarea
+  attributes:
+    label: Description
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: What you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Actual behavior
+    description: What actually happened.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    placeholder: |
+      1. ...
+      2. ...
+  validations:
+    required: false
+- type: input
+  attributes:
+    label: Swift Package Manager version/commit hash
+  validations:
+    required: false 
+- type: textarea
+  attributes:
+    label: Swift & OS version (output of `swift --version && uname -a`)
+  validations:
+    required: false 

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,135 +1,109 @@
-Adrian-Constantin Popescu <epsilon.gamma@gmail.com> <adrian-constantin.popescu@outlook.com>
+Alex Blewitt <alblue@apple.com> <alblue@apple.com>
 Alex Blewitt <[email protected]> <[email protected]>
-Alex Hoppen <[email protected]> <[email protected]>
-Alexis Beingessner <[email protected]> <[email protected]>
-Alper Çugun <[email protected]> <[email protected]>
-Amr Aboelela <[email protected]> <[email protected]>
+Alex Hoppen <[email protected]> <[email protected]>
+Alex Hoppen <[email protected]> <[email protected]>
+Andrew Bennett <[email protected]> <[email protected]>
+Andrew Bennett <[email protected]> <[email protected]>
+Ankit Aggarwal <[email protected]> <[email protected]>
 Ankit Aggarwal <[email protected]> <[email protected]>
-Argyrios Kyrtzidis <[email protected]> <[email protected]>
-Arsen Gasparyan <[email protected]> <[email protected]>
-Ben Cohen <[email protected]>
+Ankit Aggarwal <[email protected]> <[email protected]>
+Ankit Aggarwal <[email protected]> <[email protected]>
+Ben Chatelain <[email protected]> <[email protected]>
+Ben Chatelain <[email protected]> <[email protected]>
+Ben Cohen <[email protected]> <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
-Ben Cohen <ben_cohen@apple.com> <[email protected]>
+Ben Langmuir <blangmuir@apple.com> <[email protected]>
 Ben Langmuir <[email protected]> <[email protected]>
-Brent Royal-Gordon <[email protected]> <[email protected]>
+Benjamin Herzog <[email protected]> <[email protected]>
+Benjamin Herzog <[email protected]> <[email protected]>
+Benjamin Scholtysik <[email protected]> <[email protected]>
+Benjamin Scholtysik (Reimold) <[email protected]> <[email protected]>
+Benjamin Scholtysik <[email protected]> <[email protected]>
+Boris Buegling <[email protected]> <[email protected]>
+Boris Buegling <[email protected]> <[email protected]>
+Braden Scothern <[email protected]> <[email protected]>
+Braden Scothern <[email protected]> <[email protected]>
+Brandon Titus <[email protected]> <[email protected]>
+Brandon Titus <[email protected]> <[email protected]>
+Brian Croom <[email protected]> <[email protected]>
 Brian Croom <[email protected]> <[email protected]>
-Brian Gesiak <[email protected]> <[email protected]>
-Bryan Chan <[email protected]> <[email protected]>
-Calvin Hill <[email protected]> <[email protected]>
-Chris Bieneman <[email protected]>
-Chris Bieneman <[email protected]> <[email protected]>
-Chris Lattner <[email protected]> <[email protected]>
-Chris Lattner <[email protected]> <[email protected]>
-Chris Lattner <[email protected]> <[email protected]>
-Chris Williams <[email protected]> <[email protected]>
-codester <[email protected]> codestergit <[email protected]>
-Dan Liew <[email protected]> <[email protected]>
-Daniel Duan <[email protected]> <[email protected]>
-Dante Broggi <[email protected]>
-Dave <[email protected]>
-Dave Abrahams <[email protected]> <[email protected]>
-Dave Abrahams <[email protected]> <[email protected]>
+Brian Gesiak <[email protected]> <[email protected]>
+Brian Gesiak <[email protected]> <[email protected]>
+Chris Lattner <[email protected]> <[email protected]>
+Chris Lattner <[email protected]> <[email protected]>
+Dan Zheng <[email protected]> <[email protected]>
+Dan Zheng <[email protected]> <[email protected]>
+Daniel Duan <[email protected]> <[email protected]>
+Daniel Duan <[email protected]> <[email protected]>
+Daniel Duan <[email protected]> <[email protected]>
+Daniel Dunbar <[email protected]> <[email protected]>
+Daniel Dunbar <[email protected]> <[email protected]>
+Dario Rexin <[email protected]> <[email protected]>
+Dario Rexin <[email protected]> <[email protected]>
+Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
-Dave Abrahams <[email protected]> <[email protected]>
-Dave Lee <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]> <[email protected]>
-David Zarzycki <[email protected]> <[email protected]>
-David Zarzycki <[email protected]> <[email protected]>
-Davide Italiano <[email protected]> <[email protected]>
-Davide Italiano <[email protected]> <[email protected]>
-Dmitri Gribenko <[email protected]> <[email protected]>
-Doug Coleman <[email protected]> <[email protected]>
-Enrico Granata <[email protected]> <[email protected]>
-Enrico Granata <[email protected]> <[email protected]>
-Erik Eckstein <[email protected]> <[email protected]>
-Erik Eckstein <[email protected]> <[email protected]>
-Erik Verbruggen <[email protected]> <[email protected]>
-Ewa Matejska <[email protected]> <[email protected]>
-Ewa Matejska <[email protected]> <[email protected]>
-Ewa Matejska <[email protected]> <[email protected]>
-Florent Bruneau <[email protected]> <[email protected]>
-Francis Ricci <[email protected]> <[email protected]>
-GauravDS <[email protected]> <[email protected]>
-Graydon Hoare <[email protected]> <[email protected]>
-Greg Parker <[email protected]> <[email protected]>
-Guillaume Lessard <[email protected]> <[email protected]>
-Hamish <[email protected]> <[email protected]>
-Han Sangjin <[email protected]> <[email protected]>
+David Hart <[email protected]> <[email protected]>
+David Hart <[email protected]> <[email protected]>
+Harlan Haskins <[email protected]> <[email protected]>
 Harlan Haskins <[email protected]> <[email protected]>
-Hitster GTD <[email protected]> <[email protected]>
-Huon Wilson <[email protected]> <[email protected]>
-Ingmar Stein <[email protected]>
-Itai Ferber <[email protected]> <[email protected]>
-Jacob Bandes-Storch <[email protected]> <[email protected]>
-Jacob Mizraji <[email protected]> <[email protected]>
-Janosch Hildebrand <[email protected]> <[email protected]>
-Janosch Hildebrand <[email protected]> <[email protected]>
-Javier Soto <[email protected]> <[email protected]>
-Javier Soto <[email protected]> <[email protected]>
-Joe <[email protected]>
-Joe <[email protected]>
-joe DeCapo <[email protected]>
-Joe Groff <[email protected]> <[email protected]>
-Joe Shajrawi <[email protected]> <[email protected]>
-Joe Shajrawi <[email protected]> <[email protected]>
-Johannes Weiß <[email protected]> <[email protected]>
-John Regner <[email protected]> <[email protected]>
-Karoy Lorentey <[email protected]> <[email protected]>
-Keith Smiley <[email protected]> <[email protected]>
-Kevin Ballard <[email protected]> <[email protected]>
-Kosuke Ogawa <[email protected]> <[email protected]>
-Kuba Mracek <[email protected]> <[email protected]>
-Luiz Fernando Silva <[email protected]>
-Luqman Aden <[email protected]> <[email protected]>
-Marcelo Fabri <[email protected]> <[email protected]>
-Mark Lacey <[email protected]> <[email protected]>
-Mark Lacey <[email protected]> <[email protected]>
-Matt Rajca <[email protected]> <[email protected]>
-Max Moiseev <[email protected]> <[email protected]>
+Helge Hess <[email protected]> <[email protected]>
+Honza Dvorsky <[email protected]> <[email protected]>
+Honza Dvorsky <[email protected]> <[email protected]>
+Honza Dvorsky <[email protected]> <[email protected]>
+J. Cheyo Jimenez <[email protected]> <[email protected]>
+J. Cheyo Jimenez <[email protected]> <[email protected]>
+Johannes Weiss <[email protected]> <[email protected]>
+Johannes Weiss <[email protected]> <[email protected]>
+Johannes Weiss <[email protected]> <[email protected]>
+Kilian Koeltzsch <[email protected]> <[email protected]>
+Kilian Koeltzsch <[email protected]> <[email protected]>
+Kyle Jessup <[email protected]> <[email protected]>
+Kyle Jessup <[email protected]> <[email protected]>
+Lev Walkin <[email protected]> <[email protected]>
+Lev Walkin <[email protected]> <[email protected]>
+Marcin Krzyzanowski <[email protected]> <[email protected]>
+Marcin Krzyzanowski <[email protected]> <[email protected]>
+Marcin Krzyzanowski <[email protected]> <[email protected]>
+Marcin Krzyzanowski <[email protected]> <[email protected]>
+Matthew Seaman <[email protected]> <[email protected]>
+Matthew Seaman <[email protected]> <[email protected]>
+Mattt Thompson <[email protected]> <[email protected]>
+Mattt Thompson <[email protected]> <[email protected]>
+Mattt Thompson <[email protected]> <[email protected]>
+Max Howell <[email protected]> <[email protected]>
+Max Howell <[email protected]> <[email protected]>
+Max Liberman <[email protected]> <[email protected]>
+Max Liberman <[email protected]> <[email protected]>
+Max Moiseev <[email protected]> <[email protected]>
 Max Moiseev <[email protected]> <[email protected]>
-Maxwell Swadling <[email protected]> <[email protected]>
-Maxwell Swadling <[email protected]> <[email protected]>
-Mayur Raiturkar <[email protected]> <[email protected]>
-Michael Gottesman <[email protected]> <[email protected]>
+Max Moiseev <[email protected]> <[email protected]>
+Michael Ilseman <[email protected]> <[email protected]>
 Michael Ilseman <[email protected]> <[email protected]>
-Mike Ash <[email protected]> <[email protected]>
-Mike Ferris <[email protected]> <[email protected]>
-Mishal Awadah <[email protected]>
+Mishal Shah <[email protected]> <[email protected]>
 Mishal Shah <[email protected]> <[email protected]>
-Nadav Rotem <[email protected]> <[email protected]>
-Nate Cook <[email protected]> <[email protected]>
-Nate Cook <[email protected]> <[email protected]>
-Nate Cook <[email protected]> <[email protected]>
-Nate Cook <[email protected]> <[email protected]>
-Nathan Lanza <[email protected]> <[email protected]>
-Nicole Jacque <[email protected]>
-Niels Andriesse <[email protected]> <[email protected]>
-Paul Meng <[email protected]> <[email protected]>
+Nikola Lajic <[email protected]> <[email protected]>
+Nikola Lajic <[email protected]> <[email protected]>
+Owen Voorhees <[email protected]> <[email protected]>
+Owen Voorhees <[email protected]> <[email protected]>
+Pavel Yaskevich <[email protected]> <[email protected]>
 Pavel Yaskevich <[email protected]> <[email protected]>
-Paweł Szot <[email protected]>
-Paweł Szot <[email protected]> <[email protected]>
-Pete Cooper <[email protected]>
-Philip Ridgeway <[email protected]> <[email protected]>
-Richard Wei <[email protected]> <[email protected]>
-Rintaro Ishizaki <[email protected]> <[email protected]>
-Robert Widmann <[email protected]> <[email protected]>
-Roman Levenstein <[email protected]> <[email protected]>
-Ross Bayer <[email protected]> <[email protected]>
-Russ Bishop <[email protected]> <[email protected]>
-Ryan Lovelett <[email protected]> <[email protected]>
-Shawn Erickson <[email protected]> <[email protected]>
-Slava Pestov <[email protected]> <[email protected]>
+Saleem Abdulrasool <[email protected]> <[email protected]>
+Saleem Abdulrasool <[email protected]> <[email protected]>
+Saleem Abdulrasool <[email protected]> <[email protected]>
+Sergio Campamá <[email protected]> <[email protected]>
+Sergio Campamá <[email protected]> <[email protected]>
+Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
-Stephen Canon <scanon@apple.com>
-Stephen Canon <scanon@apple.com> <stephentyrone@gmail.com>
-Sukolsak Sakshuwong <sukolsak@gmail.com>
-Todd Fiala <tfiala@apple.com> <todd.fiala@gmail.com>
-Toni Suter <tonisuter@me.com> <[email protected].com>
-Vedant Kumar <vsk@apple.com> <vk@vedantk.com>
-Xi Ge <xi_ge@apple.com> <[email protected].apple.com>
-Xin Tong <xin_tong@apple.com> <trent.xin.tong@gmail.com>
-Xin Tong <xin_tong@apple.com> <[email protected]>
-Yuka Ezura <[email protected].com> <[email protected].com>
-Yurii Samsoniuk <ura@google.com> <mr.sigito@gmail.com>
-Zac Bowling <zbowling@google.com> <zac@zacbowling.com>
-冀卓疌 <[email protected].com>
+Thomas Roughton <[email protected]> <t.roughton@me.com>
+Thomas Roughton <t.roughton@me.com> <[email protected].com>
+Tim Condon <[email protected]> <[email protected].com>
+Tim Condon <[email protected].com> <tg908@icloud.com>
+Tim Gymnich <tgymnich@icloud.com> <tgymnich@icloud.com>
+Tim Gymnich <tgymnich@icloud.com> <tg908@icloud.com>
+Tom Doron <tomer@apple.com> <tomer@apple.com>
+Valeriy Van <valeriy.van@enote.com> <valeriy.van@enote.com>
+Valeriy Van <valeriy.van@enote.com> <[email protected]>
+therealbnut <andrew.charles.bennett@gmail.com> <andrew.charles.bennett@gmail.com>
+therealbnut <andrew.charles.bennett@gmail.com> <[email protected].com>
+buttaface <butta@fastem.com> <butta@fastem.com>
+buttaface <[email protected]> <[email protected].com>

.mailmap

@@ -307,7 +307,7 @@ Note there are several Linux and Swift versions options to choose from, e.g.:
 9. Make a PR from your fork / branch to `apple: main`
 10. While creating your PR, make sure to follow the PR Template providing information about the motivation and highlighting the changes.
 11. Reviewers are going to be automatically added to your PR
-12. Merge pull request when you received approval from the reviewers (one or more)
+12. Pull requests will be merged by the maintainers after it passes CI testing and receives approval from one or more reviewers. Merge timing may be impacted by release schedule considerations.
 
 By submitting a pull request, you represent that you have the right to license
 your contribution to Apple and the community, and agree by submitting the patch