Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into wen_restart_gossip_change
Browse files Browse the repository at this point in the history
  • Loading branch information
wen-coding authored Oct 9, 2023
2 parents 1ee2699 + 0526775 commit 78a9ded
Show file tree
Hide file tree
Showing 760 changed files with 3,027 additions and 9,214 deletions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/2-feature-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ body:
`solana_sdk::declare_id!()` within the module. Additionally, add an entry to `FEATURE_NAMES` map.
3. Add desired logic to check for and switch on feature availability.
- type: input
id: simd
attributes:
label: SIMD
description: Solana IMprovement Document (SIMD)
placeholder: Link to the https://github.com/solana-foundation/solana-improvement-documents document for this feature
validations:
required: true
- type: textarea
id: description
attributes:
Expand Down
24 changes: 12 additions & 12 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ pull_request_rules:
- automerge
comment:
message: automerge label removed due to a CI failure
- name: v1.14 feature-gate backport
- name: v1.16 feature-gate backport
conditions:
- label=v1.14
- label=v1.16
- label=feature-gate
actions:
backport:
Expand All @@ -86,21 +86,21 @@ pull_request_rules:
labels:
- feature-gate
branches:
- v1.14
- name: v1.14 non-feature-gate backport
- v1.16
- name: v1.16 non-feature-gate backport
conditions:
- label=v1.14
- label=v1.16
- label!=feature-gate
actions:
backport:
assignees: *BackportAssignee
title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
ignore_conflicts: true
branches:
- v1.14
- name: v1.16 feature-gate backport
- v1.16
- name: v1.17 feature-gate backport
conditions:
- label=v1.16
- label=v1.17
- label=feature-gate
actions:
backport:
Expand All @@ -110,18 +110,18 @@ pull_request_rules:
labels:
- feature-gate
branches:
- v1.16
- name: v1.16 non-feature-gate backport
- v1.17
- name: v1.17 non-feature-gate backport
conditions:
- label=v1.16
- label=v1.17
- label!=feature-gate
actions:
backport:
assignees: *BackportAssignee
title: "{{ destination_branch }}: {{ title }} (backport of #{{ number }})"
ignore_conflicts: true
branches:
- v1.16
- v1.17

commands_restrictions:
# The author of copied PRs is the Mergify user.
Expand Down
Loading

0 comments on commit 78a9ded

Please sign in to comment.