Skip to content

Commit

Permalink
Merge pull request #1468 from Conflux-Chain/mergify/iosh/config-update
Browse files Browse the repository at this point in the history
ci(Mergify): configuration update
  • Loading branch information
mergify[bot] authored Dec 12, 2024
2 parents b353fcc + a7be755 commit 1863244
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 39 deletions.
46 changes: 8 additions & 38 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
queue_rules:
- name: duplicated default queue from Automatic queue to dev on approval [low]
- name: Automatic queue to dev on approval
queue_conditions:
- "#approved-reviews-by>=1"
- label!=work-in-progress
Expand All @@ -22,8 +22,7 @@ queue_rules:
- label!=wip
- status-success~=^build\s\(.*\)$
merge_method: squash
- name: duplicated default queue from Automatic queue to dev on approval (__release-pkg)
[low]
- name: Automatic queue to dev on approval (__release-pkg)
queue_conditions:
- "#approved-reviews-by>=1"
- label!=work-in-progress
Expand Down Expand Up @@ -68,42 +67,13 @@ pull_request_rules:
- head!=main
actions:
update:
- name: Automatic queue to dev on approval [low]
conditions:
- "#approved-reviews-by>=1"
- label!=work-in-progress
- label!=wip
- label!=no-auto-squash-merge
- base=dev
- head!=next
- -conflict
- -draft
- -locked
- status-success~=^version-check\s\(.*\)$
- status-success~=^lint\s\(.*\)$
- status-success~=^build\s\(.*\)$
- status-success~=^build-doc\s\(.*\)$
- status-success~=^unit-test\s\(.*\)$
- status-success~=^integration-test\s\(.*\)$
- "#review-threads-unresolved=0"
- name: Automatic queue to dev on approval (__release-pkg)
conditions: []
actions:
queue:
name: default queue

- name: Automatic queue to dev on approval (__release-pkg) [low]
conditions:
- "#approved-reviews-by>=1"
- label!=work-in-progress
- label!=wip
- label!=no-auto-squash-merge
- base=dev
- head=__release-pkg
- -conflict
- -draft
- -locked
- status-success~=^build\s\(.*\)$
- "#review-threads-unresolved=0"
name: Automatic queue to dev on approval (__release-pkg)
- name: Automatic queue to dev on approval [low]
conditions: []
actions:
queue:
name: default queue

name: Automatic queue to dev on approval
8 changes: 8 additions & 0 deletions .yarn/versions/5ca621c7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
releases:
"@fluent-wallet/inner-utils": patch
browser-extension: patch
helios-background: patch
helios-popup: patch

declined:
- helios
2 changes: 1 addition & 1 deletion packages/inner-utils/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export const IS_CI = process.env.CI === 'true'
export const PACKAGE_VERSION = process.env.PACKAGE_VERSION
// this version is use by view, it include the version suffix e.g v1.0.0.rc-1
export const VIEW_PACKAGE_VERSION =
'process.env.VIEW_PACKAGE_VERSION' || PACKAGE_VERSION
process.env.VIEW_PACKAGE_VERSION || PACKAGE_VERSION

0 comments on commit 1863244

Please sign in to comment.