Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history
MS2 release

See merge request interlay/btc-parachain!223
  • Loading branch information
nud3l committed Nov 15, 2020
2 parents 20edf2f + 7e939a1 commit 3c7a84b
Show file tree
Hide file tree
Showing 101 changed files with 5,555 additions and 1,942 deletions.
2 changes: 1 addition & 1 deletion .deploy/kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Helm chart for PolkaBTC
type: application
apiVersion: v2
version: 0.1.1
appVersion: 2.0.0-rc6
appVersion: 2.0.0

home: https://interlay.io/
sources:
Expand Down
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

56 changes: 4 additions & 52 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,7 @@
image: "registry.gitlab.com/interlay/btc-parachain:ci-nightly-2020-10-01"
include:
- project: interlay/tools/ci-scripts
file: /gitlab-templates/rust-base-gitlab-ci.yaml

variables:
CARGO_HOME: $CI_PROJECT_DIR/.cargo
# RUSTC_WRAPPER: sccache
# SCCACHE_GCS_RW_MODE: READ_WRITE
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
ARTIFACT_BIN_PATH: btc-parachain

before_script:
- rustc --version
- rustfmt --version
- cargo --version
- SCCACHE_START_SERVER=1 SCCACHE_NO_DAEMON=1 sccache &
- sccache -s

after_script:
- sccache -s

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

# pallets and crates
test-pallets-and-crates:
stage: test
script:
- cargo fmt -- --check
- cargo check --all
- cargo build --release --verbose
- cargo test --all --release
cache:
key: cargo
paths:
- .cargo
only:
- merge_requests

docker-publish:
stage: deploy
image: docker:19.03.12
services:
- docker:19.03.12-dind
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
- docker pull $CI_REGISTRY_IMAGE:latest || true
- docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker push $CI_REGISTRY_IMAGE:latest
only:
- master
- dev
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"editor.formatOnSave": true,
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust"
"editor.defaultFormatter": "matklad.rust-analyzer"
}
}
Loading

0 comments on commit 3c7a84b

Please sign in to comment.