Skip to content

Commit 6f0af0e

Browse files
authored
fix(apollo-router-fork): fix toolchain version, fix build, update Crate resolver (#6788)
1 parent 0e00fa0 commit 6f0af0e

File tree

9 files changed

+1267
-1161
lines changed

9 files changed

+1267
-1161
lines changed

.changeset/light-foxes-study.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'hive-apollo-router-plugin': patch
3+
---
4+
5+
Bump version to trigger release, fix lockfile

.github/workflows/apollo-router-updater.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Rust
2929
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
3030
with:
31-
toolchain: '1.84.1'
31+
toolchain: '1.85.1'
3232
default: true
3333
override: true
3434

.github/workflows/publish-rust.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,11 @@ jobs:
8484
- name: Install Rust
8585
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
8686
with:
87-
toolchain: '1.84.1'
87+
toolchain: '1.85.1'
8888
target: ${{ env.RUST_TARGET }}
8989
default: true
9090
override: true
9191

92-
- name: Set default target
93-
run: |
94-
rustup default 1.84.1-${{ env.RUST_TARGET }}
95-
9692
- name: Cache Rust
9793
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
9894

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
[workspace]
2-
members = [
3-
"packages/libraries/router",
4-
"scripts/compress"
5-
]
2+
resolver = "2"
3+
members = ["packages/libraries/router", "scripts/compress"]

0 commit comments

Comments
 (0)