Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.2.6: refactor runtime.land #5

Merged
merged 1 commit into from
Jun 10, 2023
Merged

v0.2.6: refactor runtime.land #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "lol-server"
prefix-key: "build-all"
- name: Update local toolchain
run: |
rustup update stable
Expand All @@ -38,17 +38,17 @@ jobs:
cargo test --all --release
- name: Build all
run: |
cargo build --release
cargo build --release -p lol-cli
cargo build --release -p lol-runtime
cargo build --release -p land-server
cargo build --release -p land-cli
cargo build --release -p land-runtime
- name: Upload binaries
uses: actions/upload-artifact@v3
with:
name: lol-binary
name: land-binary
path: |
target/release/lol-cli
target/release/lol-server
target/release/lol-runtime
target/release/land-cli
target/release/land-server
target/release/land-runtime

test-wit-v2:
runs-on: ubuntu-latest
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ghcr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
fail-fast: false
matrix:
include:
- dockerfile: ./deploy/lol-server.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/lol-server
- dockerfile: ./deploy/land-server.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/land-server
make_subcommand: "build-server"
- dockerfile: ./deploy/lol-runtime.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/lol-runtime
- dockerfile: ./deploy/land-runtime.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/land-runtime
make_subcommand: "build-runtime"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "lol-image"
prefix-key: "build-image"
- name: Update local toolchain
run: |
rustup update stable
Expand All @@ -45,8 +45,8 @@ jobs:
protoc --version
- name: Build
run: |
cargo build --release
cargo build --release -p lol-runtime
cargo build --release -p land-server
cargo build --release -p land-runtime
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand Down Expand Up @@ -80,8 +80,8 @@ jobs:
fail-fast: false
matrix:
include:
- dockerfile: ./deploy/lol-web.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/lol-web
- dockerfile: ./deploy/land-web.Dockerfile
image: ghcr.io/${{ github.repository_owner }}/land-web
steps:
- uses: actions/checkout@v3
with:
Expand Down
150 changes: 75 additions & 75 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "lol-server"
name = "land-server"
version = { workspace = true }
edition = { workspace = true }
authors = { workspace = true }
Expand All @@ -8,15 +8,15 @@ authors = { workspace = true }
anyhow = { workspace = true }
axum = { workspace = true }
clap = { workspace = true }
lol-core = { path = "crates/core" }
lol-rpc = { path = "crates/rpc" }
land-core = { path = "crates/core" }
land-rpc = { path = "crates/rpc" }
serde = { workspace = true }
tokio = { workspace = true }
toml = { workspace = true }
tracing = { workspace = true }

[build-dependencies]
lol-runtime = { path = "crates/runtime" }
land-runtime = { path = "crates/runtime" }

[workspace]
members = [
Expand Down Expand Up @@ -76,6 +76,6 @@ wit-component = "0.11.0"
uuid = { version = "1.3.3", features = ["v4"] }

[workspace.package]
version = "0.2.5"
version = "0.2.6"
edition = "2021"
authors = ["fuxiaohei <[email protected]>"]
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ build-server:

build-runtime:
@echo "Building runtime..."
@cargo build --release -p lol-runtime
@cargo build --release -p land-runtime

build-cli:
@echo "Building CLI..."
@cargo build --release -p lol-cli
@cargo build --release -p land-cli

build-web:
@echo "Building web..."
Expand Down
Loading