Skip to content

Commit

Permalink
merge origin/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
0xOmarA committed Jul 6, 2023
2 parents 431e646 + 21bd626 commit 28eca13
Show file tree
Hide file tree
Showing 456 changed files with 22,778 additions and 82,792 deletions.
53 changes: 0 additions & 53 deletions .github/pull_request_template.md

This file was deleted.

405 changes: 253 additions & 152 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions .github/workflows/release.yml

This file was deleted.

40 changes: 7 additions & 33 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,26 @@ name: Test
on:
pull_request:
branches:
- betanet
- develop
- main
- develop
- release/*
push:
branches:
- betanet
- develop
- main
- develop
- release/*

env:
CARGO_TERM_COLOR: always

jobs:
rust-test:
test:
runs-on: ubuntu-latest
strategy:
matrix:
crate: [ native-json-interface, radix-engine-toolkit ]
crate: [ radix-engine-toolkit, radix-engine-toolkit-core ]

steps:
- uses: actions/checkout@v3
- name: Install Targets
run: rustup target install wasm32-unknown-unknown
- name: Run tests
run: cargo test --manifest-path ./${{ matrix.crate }}/Cargo.toml --verbose

schema-and-example-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Generating new schema and examples
run: |
cd schema
mv out old-out
mkdir -p out/examples
mkdir -p out/schema
cargo run
- name: Comparing old examples to newly generated
run: |
cd schema
cmp --quiet ./out/examples/request-examples.md ./old-out/examples/request-examples.md && exit 0 || exit 1
- name: Comparing old schema to newly generated
run: |
cd schema
for filename in $(find ./out/schema -type f -name "*.json" -exec basename {} \;);
do
cmp --quiet out/schema/$filename ./old-out/schema/$filename && exit 0 || exit 1
done
exit 0
run: cargo test --manifest-path ./${{ matrix.crate }}/Cargo.toml --verbose
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ openapi-generator-cli-6.0.1.jar
.DS_Store
Cargo.lock
.idea
build
output
./radixdlt-scrypto/
59 changes: 36 additions & 23 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,41 @@
{
"rust-analyzer.linkedProjects": [
"Cargo.toml",
"native-json-interface/Cargo.toml",
"cli-json-interface/Cargo.toml",
"benches/Cargo.toml",
"radix-engine-toolkit-uniffi/Cargo.toml",
"radix-engine-toolkit-core/Cargo.toml",
"radix-engine-toolkit/Cargo.toml",
"generator/Cargo.toml",
"uniffi-bindgen/Cargo.toml"
],
"cSpell.words": [
"bech",
"Decompilation",
"decompile",
"decompiled",
"eddsa",
"instantiatable",
"Instrumenter",
"persistable",
"repr",
"Sbor",
"Scrypto",
"Secp",
"Substate",
"substates",
"Untimed",
"virtualizable",
"Wasmer",
"Wasmi"
]
"adapanet",
"ansharnet",
"archiver",
"cbrt",
"decryptors",
"Devopsnet",
"dumunet",
"enkinet",
"gilganet",
"hammunet",
"kisharnet",
"Localnet",
"mardunet",
"Milestonenet",
"nebunet",
"nergalnet",
"openapi",
"powi",
"radixdlt",
"RCNet",
"Releasenet",
"Ruid",
"rustfmt",
"Sandpitnet",
"testcases",
"thiserror",
"unhashed",
"uniffi",
"unstake",
"walkdir"
],
}
6 changes: 0 additions & 6 deletions Cargo.toml

This file was deleted.

Loading

0 comments on commit 28eca13

Please sign in to comment.