Skip to content

Commit

Permalink
Merge pull request #150 from RainwayApp/rust-alpha
Browse files Browse the repository at this point in the history
Rust alpha
  • Loading branch information
Andrew committed Sep 1, 2021
2 parents 3047456 + fd733df commit 3c26a71
Show file tree
Hide file tree
Showing 14 changed files with 1,219 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=2.2.6
VERSION=2.3.0
19 changes: 12 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,17 +164,16 @@ jobs:

- name: Extract Compiler Artifacts
run: |
mkdir -p ${{github.workspace}}/bin/compiler/Linux-Debug
unzip -j -o ./linux-x64/bebopc.zip -d ${{github.workspace}}/bin/compiler/Linux-Debug
ls
unzip -j -o ./linux-x64/bebopc.zip -d ${{env.BEBOPC_PATH}}/linux
# todo: depend on a different job
- name: Test Rust Runtime
run: cargo test
working-directory: ${{ env.RUST_RUNTIME_ROOT }}
- name: Test Rust Labratory
run: |
mkdir -p ./tools/compiler/Linux-Debug
cp ${{env.BEBOPC_PATH}}/linux ./tools/compiler/Linux-Debug
cargo check -p auto-testing
cargo test -p functionality-testing
working-directory: ${{ env.RUST_TEST_ROOT }}
Expand All @@ -184,7 +183,7 @@ jobs:
run: |
sed 's/^version \?= \?.*/version = "${{ steps.dotenv.outputs.version }}"/' Cargo.toml > tmp
mv tmp Cargo.toml
cargo package
cargo package --allow-dirty
- name: Upload Rust Runtime
uses: actions/upload-artifact@v2
with:
Expand Down Expand Up @@ -270,7 +269,7 @@ jobs:
run: |
sed 's/^version \?= \?.*/version = "${{ steps.dotenv.outputs.version }}"/' Cargo.toml > tmp
mv tmp Cargo.toml
cargo --allow-dirty package
cargo package --allow-dirty
- name: Upload Cargo Tools
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -335,11 +334,17 @@ jobs:
run: dotnet nuget push bebop-runtime-cs-${{ steps.dotenv.outputs.version }}/bebop.${{ steps.dotenv.outputs.version }}.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate

- name: Publish Rust Tools
run: cargo publish
run: |
sed 's/^version \?= \?.*/version = "${{ steps.dotenv.outputs.version }}"/' Cargo.toml > tmp
mv tmp Cargo.toml
cargo publish --allow-dirty
working-directory: ${{env.TOOLS_ROOT}}/cargo

- name: Publish Rust Runtime
run: cargo publish
run: |
sed 's/^version \?= \?.*/version = "${{ steps.dotenv.outputs.version }}"/' Cargo.toml > tmp
mv tmp Cargo.toml
cargo publish --allow-dirty
working-directory: ${{env.RUST_RUNTIME_ROOT}}

- name: Publish NodeJS Tools
Expand Down
9 changes: 0 additions & 9 deletions Laboratory/Rust/Cargo.lock

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

2 changes: 1 addition & 1 deletion Laboratory/Rust/auto-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ edition = "2018"
bebop = { path = "../../../Runtime/Rust" }

[build-dependencies]
bebop-tools = { path = "../../../Tools/cargo" }
bebop-tools = { path = "../../../Tools/cargo", default-features = false }
2 changes: 1 addition & 1 deletion Laboratory/Rust/benchmarking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ rmp-serde = "0.15.5"
bincode = "1.3.3"

[build-dependencies]
bebop-tools = { path = "../../../Tools/cargo" }
bebop-tools = { path = "../../../Tools/cargo", default-features = false }
protobuf-codegen-pure = "2.24.1"
2 changes: 1 addition & 1 deletion Laboratory/Rust/functionality-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ edition = "2018"
bebop = { path = "../../../Runtime/Rust" }

[build-dependencies]
bebop-tools = { path = "../../../Tools/cargo" }
bebop-tools = { path = "../../../Tools/cargo", default-features = false }
3 changes: 3 additions & 0 deletions Laboratory/Rust/functionality-testing/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ fn main() {
unsafe {
bebop::COMPILER_PATH = Some(PathBuf::from(BEBOP_BIN));
}
// bebop::download_bebopc(
// PathBuf::from("../target").join("bebopc"),
// );
bebop::build_schema_dir("schemas", "src/generated");
}
2 changes: 1 addition & 1 deletion Laboratory/Rust/manual-testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2018"
[lib]

[dependencies]
bebop = { path = "../../../Runtime/Rust" }
bebop = { path = "../../../Runtime/Rust", default-features = false }

0 comments on commit 3c26a71

Please sign in to comment.