Skip to content

Commit 5228316

Browse files
committed
Merge remote-tracking branch 'origin/main' into crate-merge
2 parents e86ab12 + 2067a56 commit 5228316

10 files changed

Lines changed: 46 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,43 @@ jobs:
100100
env:
101101
CARGO_INCREMENTAL: "0"
102102

103+
rust-msrv:
104+
name: Check MSRV
105+
runs-on: ubuntu-latest
106+
needs: changes
107+
if: needs.changes.outputs.code == 'true' || github.event_name != 'pull_request'
108+
steps:
109+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
110+
111+
- name: Read MSRV from Cargo.toml
112+
id: msrv
113+
run: |
114+
msrv=$(sed -n 's/^rust-version = "\(.*\)"$/\1/p' Cargo.toml)
115+
if [ -z "$msrv" ]; then
116+
echo "Could not find rust-version in workspace Cargo.toml" >&2
117+
exit 1
118+
fi
119+
echo "msrv=$msrv" >> "$GITHUB_OUTPUT"
120+
echo "MSRV: $msrv"
121+
122+
- uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1
123+
with:
124+
toolchain: ${{ steps.msrv.outputs.msrv }}
125+
126+
- name: Install Dependencies
127+
run: |
128+
sudo apt update -y
129+
sudo apt install -y libdbus-1-dev libxcb1-dev
130+
131+
- uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
132+
with:
133+
key: msrv
134+
135+
- name: Check with MSRV toolchain
136+
run: cargo check --workspace --locked --all-targets
137+
env:
138+
CARGO_INCREMENTAL: "0"
139+
103140
rust-lint:
104141
name: Lint Rust Code
105142
runs-on: ubuntu-latest

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ resolver = "2"
1010
[workspace.package]
1111
edition = "2021"
1212
version = "1.31.0"
13+
rust-version = "1.91.1"
1314
authors = ["AAIF <ai-oss-tools@block.xyz>"]
1415
license = "Apache-2.0"
1516
repository = "https://github.com/aaif-goose/goose"

crates/goose-acp-macros/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "goose-acp-macros"
33
edition.workspace = true
4+
rust-version.workspace = true
45
version.workspace = true
56
authors.workspace = true
67
license.workspace = true

crates/goose-cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "goose-cli"
33
version.workspace = true
44
edition.workspace = true
5+
rust-version.workspace = true
56
authors.workspace = true
67
license.workspace = true
78
repository.workspace = true

crates/goose-mcp/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "goose-mcp"
33
version.workspace = true
44
edition.workspace = true
5+
rust-version.workspace = true
56
authors.workspace = true
67
license.workspace = true
78
repository.workspace = true

crates/goose-sdk/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "goose-sdk"
33
version.workspace = true
44
edition.workspace = true
5+
rust-version.workspace = true
56
authors.workspace = true
67
license.workspace = true
78
repository.workspace = true

crates/goose-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "goose-server"
33
version.workspace = true
44
edition.workspace = true
5+
rust-version.workspace = true
56
authors.workspace = true
67
license.workspace = true
78
repository.workspace = true

crates/goose-test-support/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "goose-test-support"
33
edition.workspace = true
4+
rust-version.workspace = true
45
version.workspace = true
56
authors.workspace = true
67
license.workspace = true

crates/goose-test/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "goose-test"
33
edition.workspace = true
4+
rust-version.workspace = true
45
version.workspace = true
56
authors.workspace = true
67
license.workspace = true

crates/goose/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "goose"
33
version.workspace = true
44
edition.workspace = true
5+
rust-version.workspace = true
56
authors.workspace = true
67
license.workspace = true
78
repository.workspace = true

0 commit comments

Comments
 (0)