Merge branch 'apache:main' into main

Author: reshke

.abi-check/7.1.0/postgres.symbols.ignore

@@ -1 +1,12 @@
 pgarch_start
+ConfigureNamesInt_gp
+child_triggers
+has_update_triggers
+ConfigureNamesBool_gp
+aocs_beginscan
+AppendOnlyBlockDirectory_GetEntry
+ConfigureNamesString_gp
+gp_pause_on_restore_point_replay
+ConfigureNamesReal_gp
+TableAmRoutine
+MainLWLockNames

.asf.yaml

@@ -54,12 +54,14 @@ github:
 
   # GitHub repository feature toggles
   features:
-    # Disable GitHub wiki as documentation is maintained elsewhere
-    wiki: false
+    # Enable GitHub wiki as documentation is maintained elsewhere
+    wiki: true
     # Enable GitHub Issues for bug tracking and feature requests
     issues: true
     # Enable GitHub Projects for project management and planning
     projects: true
+    # Enable GitHub Discussions for community discussions
+    discussions: true
 
   # Configure available merge strategies for pull requests
   enabled_merge_buttons:
@@ -78,27 +80,31 @@ github:
         # Require branches to be up to date before merging
         strict: true
 
-      # Required status checks that must pass
-      # Note: These contexts match the exact job names in GitHub
-      # Actions workflows. They do not include the workflow name as a
-      # prefix
-      contexts:
-        - check-skip
-        - Build Apache Cloudberry
-        - RPM Install Test Apache Cloudberry
-        - ic-good-opt-off
-        - ic-good-opt-on
-        - ic-expandshrink
-        - ic-singlenode
-        - ic-resgroup-v2
-        - ic-contrib
-        - ic-gpcontrib
-        - ic-fixme
-        - ic-isolation2
-        - ic-isolation2-crash
-        - ic-parallel-retrieve-cursor
-        - Generate Apache Cloudberry Build Report
-        - ic-cbdb-parallel
+        # Required status checks that must pass
+        # Note: These contexts match the exact job names in GitHub
+        # Actions workflows. They do not include the workflow name as a
+        # prefix
+        contexts:
+          - rat-check
+          - check-skip
+          - Build Apache Cloudberry RPM
+          - RPM Install Test Apache Cloudberry
+          - ic-good-opt-off
+          - ic-good-opt-on
+          - pax-ic-good-opt-off
+          - pax-ic-good-opt-on
+          - pax-ic-isolation2-opt-off
+          - pax-ic-isolation2-opt-on
+          - ic-expandshrink
+          - ic-singlenode
+          - ic-resgroup-v2
+          - ic-contrib
+          - ic-gpcontrib
+          - ic-fixme
+          - ic-isolation2
+          - ic-isolation2-crash
+          - ic-parallel-retrieve-cursor
+          - Generate Apache Cloudberry Build Report
 
       # Pull request review requirements
       required_pull_request_reviews:
@@ -116,6 +122,18 @@ github:
       # Require conversation threads to be resolved
       required_conversation_resolution: true
 
+    # Branch protection for REL_2_STABLE release branch
+    REL_2_STABLE:
+      # Pull request review requirements
+      required_pull_request_reviews:
+        # Require new reviews when new commits are pushed
+        dismiss_stale_reviews: false
+        # Require at least 2 approving reviews
+        required_approving_review_count: 2
+
+      # Require conversation threads to be resolved
+      required_conversation_resolution: true
+
   # Branch cleanup settings
   # Don't automatically delete branches after merging
   del_branch_on_merge: true

.github/DISCUSSION_TEMPLATE/ideas-feature-requests.yml

@@ -1,3 +1,23 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
 title: "[Ideas] "
 labels: ["type: Enhancement"]
 body:

.github/DISCUSSION_TEMPLATE/proposal.yml

@@ -1,3 +1,23 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
 title: "[Proposal] "
 labels: ["type: Proposal"]
 body:

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,3 +1,23 @@
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
 name: "\U0001F41B Bug Report"
 description: Problems and issues with code in Apache Cloudberry core.
 title: "[Bug] "

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,24 @@
-blank_issues_enabled: false
+# --------------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to You under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of the
+# License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# --------------------------------------------------------------------
+
+blank_issues_enabled: true
 contact_links:
   - name: 🙏🏻 Q&A
     url: https://github.com/apache/cloudberry/discussions/categories/q-a