Skip to content

Commit

Permalink
chore: Rust 1.79, MSRV 1.77, cleanup (#1800)
Browse files Browse the repository at this point in the history
* chore: Rust 1.79, MSRV 1.77, cleanup

* nit
  • Loading branch information
jonaro00 authored Jun 14, 2024
1 parent 03406f0 commit 6fb9a85
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 79 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
docker-rust:
docker:
# Note: Let CI use our MSRV, rather than latest
- image: cimg/rust:1.75.0
- image: cimg/rust:1.77.0
resource_class: small
machine-ubuntu:
machine:
Expand Down Expand Up @@ -103,7 +103,7 @@ commands:
- run:
name: Install Rust (MSRV)
# Note: Let CI use our MSRV, rather than latest
command: which cargo || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0
command: which cargo || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.77.0
install-protoc:
steps:
- run:
Expand Down Expand Up @@ -571,7 +571,7 @@ jobs:
name: Install Rust
command: |
wget -OutFile "C:\rustup-init.exe" https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
C:\rustup-init.exe -y --default-toolchain 1.75.0 --target x86_64-pc-windows-msvc
C:\rustup-init.exe -y --default-toolchain 1.77.0 --target x86_64-pc-windows-msvc
- run:
name: "Install Shuttle"
command: ..\.cargo\bin\cargo.exe install cargo-shuttle --path ./cargo-shuttle
Expand Down
47 changes: 9 additions & 38 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,16 @@
This document demonstrates how to run the code in this repo, and general tips for developing it.
See [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines about commit style, issues, PRs, and more.

## Project Layout
---

> 🚨 NOTE 🚨: Big rewrites during our Beta stage has made some details below outdated.
> We intend to properly update the diagram(s) and descriptions when the new architecture stabilizes.
The folders in this repository relate to each other as follow:

```mermaid
graph BT
classDef default fill:#1f1f1f,stroke-width:0,color:white;
classDef binary fill:#f25100,font-weight:bolder,stroke-width:0,color:white;
classDef external fill:#343434,font-style:italic,stroke:#f25100,color:white;
deployer:::binary
cargo-shuttle:::binary
common
codegen
proto
provisioner:::binary
service
gateway:::binary
auth:::binary
user([user service]):::external
gateway --> common
gateway -.->|starts instances| deployer
gateway -->|key| auth
auth -->|jwt| gateway
deployer --> proto
deployer -.->|calls| provisioner
service ---> common
deployer --> common
cargo-shuttle --->|"features = ['builder']"| service
deployer -->|"features = ['builder']"| service
cargo-shuttle --> common
service --> codegen
proto ---> common
provisioner --> proto
user -->|"features = ['codegen']"| service
```
> 🚨 NOTE 🚨: Big rewrites of Shuttle's infra and backends are ongoing.
> Many parts of this document will be outdated soon.
---

> 🚨 NOTE 🚨: Local development and testing is somewhat limited without a Permit.io API key.
## Project Layout

### Binaries

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BUILDX_FLAGS=$(BUILDX_OP) $(PLATFORM_FLAGS)

# The Rust version used by our containers
# Can be updated to the latest stable
RUSTUP_TOOLCHAIN=1.78.0
RUSTUP_TOOLCHAIN=1.79.0

TAG?=$(shell git describe --tags --abbrev=0)
AUTH_TAG?=$(TAG)
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license.workspace = true
repository.workspace = true
description = "Common library for the shuttle platform (https://www.shuttle.rs/)"
# Base MSRV for the Shuttle crates. If some other crate has a higher MSRV, set it in that crate.
rust-version = "1.75"
rust-version = "1.77"

[dependencies]
anyhow = { workspace = true }
Expand Down
36 changes: 0 additions & 36 deletions shell.nix

This file was deleted.

0 comments on commit 6fb9a85

Please sign in to comment.