Skip to content

Commit d8ab8a6

Browse files
committed
Merge branch 'main' into feat/tco
2 parents 68b12f5 + 38f1057 commit d8ab8a6

File tree

91 files changed

+1352
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1352
-388
lines changed

.github/merge-queue.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# .github/merge-queue.yml
2+
queue_rules:
3+
- name: default
4+
conditions:
5+
# Require all status checks to pass
6+
- status-success~=.*

.github/workflows/benchmarks-execute.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- "extensions/**"
1717
- "Cargo.toml"
1818
- ".github/workflows/benchmarks-execute.yml"
19+
merge_group:
1920
workflow_dispatch:
2021

2122
concurrency:

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
- ".github/workflows/benchmark-call.yml"
1818
- ".github/workflows/benchmarks.yml"
1919
- "Cargo.toml"
20+
merge_group:
2021
workflow_dispatch:
2122
inputs:
2223
flamegraphs:

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: ["main"]
66
pull_request:
77
branches: ["**"]
8+
merge_group:
89

910
concurrency:
1011
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}

.github/workflows/cli.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- "examples/**"
1616
- "Cargo.toml"
1717
- ".github/workflows/cli.yml"
18+
merge_group:
1819
workflow_dispatch:
1920
inputs:
2021
use_local_openvm:

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
branches: [main]
1010
paths:
1111
- ".github/workflows/docs.yml"
12+
merge_group:
1213

1314
env:
1415
CARGO_NET_GIT_FETCH_WITH_CLI: true

.github/workflows/extension-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- "extensions/**"
1313
- "Cargo.toml"
1414
- ".github/workflows/extension-tests.yml"
15+
merge_group:
1516

1617
concurrency:
1718
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}

.github/workflows/guest-lib-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- "Cargo.toml"
1515
- ".github/workflows/guest-lib-tests.yml"
1616
- "crates/sdk/guest/fib/**"
17+
merge_group:
1718

1819
concurrency:
1920
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}

.github/workflows/lints.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: ["main"]
66
pull_request:
77
branches: ["**"]
8+
merge_group:
89

910
concurrency:
1011
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}

.github/workflows/native-compiler.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- "extensions/native/compiler/**"
1212
- "Cargo.toml"
1313
- ".github/workflows/native-compiler.yml"
14+
merge_group:
1415

1516
concurrency:
1617
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}

0 commit comments

Comments
 (0)