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

chore(net): move sails-net-client-gen to root workspace, add cli command #720

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore(net): move sails-net-client-gen to root workspace, add cli command #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ca4d5
move sails-net-client-gen to root, add cli command
vobradovich Dec 9, 2024
691cb78
update CI
vobradovich Dec 9, 2024
65fa39b
rename to sails-client-gen-net
vobradovich Dec 9, 2024
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
4 changes: 0 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "cargo"
directory: "/net/rs"
schedule:
interval: "weekly"
- package-ecosystem: "nuget"
directory: "/"
schedule:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/net-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Build & Test Client Generator
run: |
cargo test --locked --manifest-path net/rs/Cargo.toml --release
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release

build_linux_x64:
name: Test Native Libraries for Linux x64
Expand All @@ -78,7 +78,7 @@ jobs:

- name: Build & Test Client Generator
run: |
cargo test --locked --manifest-path net/rs/Cargo.toml --release
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release

build_osx_x64:
name: Test Native Libraries for NacOS x64
Expand All @@ -90,7 +90,7 @@ jobs:
- name: Build & Test Client Generator
run: |
rustup target add x86_64-apple-darwin
cargo test --locked --manifest-path net/rs/Cargo.toml --release --target x86_64-apple-darwin
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target x86_64-apple-darwin

build_osx_arm64:
name: Test Native Libraries for MacOS ARM64
Expand All @@ -101,4 +101,4 @@ jobs:
- name: Build & Test Client Generator
run: |
rustup target add aarch64-apple-darwin
cargo test --locked --manifest-path net/rs/Cargo.toml --release --target aarch64-apple-darwin
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target aarch64-apple-darwin
40 changes: 20 additions & 20 deletions .github/workflows/net-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ jobs:

- name: Build & Test Client Generator
run: |
cargo build --locked --manifest-path net/rs/Cargo.toml --release
cargo test --locked --manifest-path net/rs/Cargo.toml --release
mkdir -p ./net/rs/target/artifacts/win-x64
cp ./net/rs/target/release/sails_net_client_gen.dll ./net/rs/target/artifacts/win-x64
cargo build --locked --manifest-path rs/client-gen-net/Cargo.toml --release
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release
mkdir -p ./target/artifacts/win-x64
cp ./target/release/sails_client_gen_net.dll ./target/artifacts/win-x64

- name: Upload Client Generator Artifacts
uses: actions/upload-artifact@v4
with:
name: native_client_gen_win_x64
path: ./net/rs/target/artifacts
path: ./target/artifacts

build_linux_x64:
name: Build Native Libraries for Linux x64
Expand All @@ -71,16 +71,16 @@ jobs:

- name: Build & Test Client Generator
run: |
cargo build --locked --manifest-path net/rs/Cargo.toml --release
cargo test --locked --manifest-path net/rs/Cargo.toml --release
mkdir -p ./net/rs/target/artifacts/linux-x64
cp ./net/rs/target/release/libsails_net_client_gen.so ./net/rs/target/artifacts/linux-x64
cargo build --locked --manifest-path rs/client-gen-net/Cargo.toml --release
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release
mkdir -p ./target/artifacts/linux-x64
cp ./target/release/libsails_client_gen_net.so ./target/artifacts/linux-x64

- name: Upload Client Generator Artifacts
uses: actions/upload-artifact@v4
with:
name: native_client_gen_linux_x64
path: ./net/rs/target/artifacts
path: ./target/artifacts

build_osx_x64:
name: Build Native Libraries for NacOS x64
Expand All @@ -94,16 +94,16 @@ jobs:
- name: Build & Test Client Generator
run: |
rustup target add x86_64-apple-darwin
cargo build --locked --manifest-path net/rs/Cargo.toml --release --target x86_64-apple-darwin
cargo test --locked --manifest-path net/rs/Cargo.toml --release --target x86_64-apple-darwin
mkdir -p ./net/rs/target/artifacts/osx-x64
cp ./net/rs/target/x86_64-apple-darwin/release/libsails_net_client_gen.dylib ./net/rs/target/artifacts/osx-x64
cargo build --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target x86_64-apple-darwin
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target x86_64-apple-darwin
mkdir -p ./target/artifacts/osx-x64
cp ./target/x86_64-apple-darwin/release/libsails_client_gen_net.dylib ./target/artifacts/osx-x64

- name: Upload Client Generator Artifacts
uses: actions/upload-artifact@v4
with:
name: native_client_gen_osx_x64
path: ./net/rs/target/artifacts
path: ./target/artifacts

build_osx_arm64:
name: Build Native Libraries for MacOS ARM64
Expand All @@ -117,16 +117,16 @@ jobs:
- name: Build & Test Client Generator
run: |
rustup target add aarch64-apple-darwin
cargo build --locked --manifest-path net/rs/Cargo.toml --release --target aarch64-apple-darwin
cargo test --locked --manifest-path net/rs/Cargo.toml --release --target aarch64-apple-darwin
mkdir -p ./net/rs/target/artifacts/osx-arm64
cp ./net/rs/target/aarch64-apple-darwin/release/libsails_net_client_gen.dylib ./net/rs/target/artifacts/osx-arm64
cargo build --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target aarch64-apple-darwin
cargo test --locked --manifest-path rs/client-gen-net/Cargo.toml --release --target aarch64-apple-darwin
mkdir -p ./target/artifacts/osx-arm64
cp ./target/aarch64-apple-darwin/release/libsails_client_gen_net.dylib ./target/artifacts/osx-arm64

- name: Upload Client Generator Artifacts
uses: actions/upload-artifact@v4
with:
name: native_client_gen_osx_arm64
path: ./net/rs/target/artifacts
path: ./target/artifacts

publish:
name: Publish NuGet Packages
Expand Down
16 changes: 16 additions & 0 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.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ members = [
"rs",
"rs/cli",
"rs/client-gen",
"rs/client-gen-net",
"rs/idl-gen",
"rs/idl-meta",
"rs/idl-parser",
Expand All @@ -34,6 +35,7 @@ sails-idl-meta = { path = "rs/idl-meta" }
sails-idl-parser = { path = "rs/idl-parser" }
sails-idl-gen = { path = "rs/idl-gen" }
sails-client-gen = { path = "rs/client-gen" }
sails-client-gen-net = { path = "rs/client-gen-net" }
sails-macros-core = { path = "rs/macros/core" }
sails-macros = { path = "rs/macros" }
sails-rs = { path = "rs" }
Expand Down Expand Up @@ -74,7 +76,7 @@ proc-macro2 = { version = "1", default-features = false }
rustdoc-types = "=0.31.0"
quote = "1.0"
scale-info = { version = "2.11", default-features = false }
serde = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde-json = { package = "serde_json", version = "1.0" }
spin = { version = "0.9", default-features = false, features = ["spin_mutex"] }
syn = "2.0"
Expand Down
Loading
Loading