Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history
Dev -> Master: Version 0.0.3

See merge request interlay/btc-parachain!64
  • Loading branch information
alexeiZamyatin committed Apr 15, 2020
2 parents db34ec1 + ee399de commit 18fc362
Show file tree
Hide file tree
Showing 38 changed files with 3,453 additions and 758 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
root = true

[*]
end_of_line = lf
charset = utf-8
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.rs]
indent_size = 4

[*.toml]
indent_size = 2

[*.{yml,yaml}]
indent_size = 4
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@

### Rust ###
# Generated by Cargo
# will have compiled files and executables
/target/
*/target/*
*/*/target/*
# These are backup files generated by rustfmt
**/*.rs.bt

### Editors ###
.idea
*.vscode
/target/*

*/launch.json

37 changes: 20 additions & 17 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ image: "rust:latest"

# Install a C compiler, cmake and git into the container.
before_script:
- apt-get -y update
- apt-get install -y build-essential cmake pkg-config libssl-dev clang libclang-dev llvm
- rustc --version && cargo --version # Print version info for debugging
- apt-get -y update
- apt-get install -y build-essential cmake pkg-config libssl-dev clang libclang-dev llvm
- rustup toolchain install nightly-2020-03-01 # rustc version 1.43.0-nightly
- rustup default nightly-2020-03-01
- rustup component add rustfmt
- rustc --version && rustfmt --version && cargo --version # Print version info for debugging

# Declare stages
stages:
- build # for crates and pallets
- test # for tests in dev
- deploy # for deployment in master
- build # for crates and pallets
- test # for tests in dev
- deploy # for deployment in master

# # master branch
# btc-parachain-test:
Expand Down Expand Up @@ -58,14 +61,14 @@ stages:

# pallets and crates
test-pallets-and-crates:
stage: test
image: rustlang/rust:nightly
script:
- cargo build --release --verbose
- cargo test --all --release
cache:
key: build-cache
paths:
- target
only:
- merge_requests
stage: test
script:
- cargo build --release --verbose
- cargo fmt -- --check
- cargo test --all --release
cache:
key: build-cache
paths:
- target
only:
- merge_requests
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug",
"program": "${workspaceRoot}/target/debug/${workspaceRootFolderName}",
"args": [],
"cwd": "${workspaceRoot}",
"sourceLanguages": ["rust"]
}

]
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.formatOnSave": true,
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust"
}
}
Loading

0 comments on commit 18fc362

Please sign in to comment.