Merge pull request #3 from PaddiM8/release

Merge release

.travis.yml

@@ -1,22 +1,47 @@
 language: rust
-before_install:
+jobs:
-  - rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
+  include:
-script:
+    - stage: compile
-  - cargo fmt
+      if: branch = master
-  - cargo build --verbose --all
+      cache: cargo
-  - cargo test --verbose --all
+      before_install:
-deploy:
+        - rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu
-  - provider: releases
+      script:
-    api_key:
+        - cargo build --verbose --all
-      secure: "eM+8mEZkCSACjZvN0lH31CA+fCPcTZ+oLu1y+IuQC4MMb8mD8CgV0Y+MXZZA1oLiIrUc6y4zU3ll6pjnU3RGzvlFEB2GPyctxct/a7/zJ3jaVjjFJbssBuCaKN+JTH2AK8530hOfpOujYGU68ENx6WEk/EltRJtc4C4ultHrDcX5gi05XPN8p153AFnjUXEdCAQfAA0Oy9w7/9qzidHe79pWMuqdzfCfrZ/JJRdl/mEfS98JJbzoPW2GqO+OoE+R59JN/QnZrMqlieE0yiEk2HXsbW/Mkosg49NFvOXzfQoH3MYX8YPh6xMkEl+szt8WC3rA2WIDqQMwfxr2PDmxB76+4999RAY/PrZ+WLYbCbU6rUVxK7hZ6Ljxxay9341RL04f+5jzs7kLSBZYil3uo61iRITAsgeVGD3aL6HAnOr3RarAo6o0AdtvL3kzI89GFgJLtPeIpvd8Kx7TgQ/a67vdOA577qyoOc40zBZE17zAbq3ybrRn2E3YOwPjNKdg7xULVe6gvfDSFxm5WqTcDdxT9Zna6nEn22ItDylfZfJksyTO+VDTB+nsctmFLzuccEG4xVsg12BMCDoOCXCjlakX18ri3vJea50ekBE3C7XMPiSZ3XboLo2L1dn/rBeeH9bPHEQMHFDwRDaPItxfBXu+L38jE1CMVTA5j030ADg="
+      on:
-    script:
+        branch: master
-      - cargo build --verbose --manifest-path kalk_cli/Cargo.toml --release
+
-    file:
+    - stage: test
-      - "kalk_cli/targets/release/kalk_cli"
+      if: branch = master
-  - provider: cargo
+      cache: cargo
-    token:
+      script: cargo test --verbose --all
-      secure: "YsnbCBywb3A4ACcCQc3ATHWVpsmoZtyJUIH5Q3MAb1qdaQtX7V/zPtsew0ZvIcL5jo0RPKOvTQaREvC2ShQPImn/LUoBY/DwutUvxFVLbU2Caubn0IUMYBZ/jD8AuQ6mEDn5DU/ieNH1sl0Z4+2itWwHVJsWhSQOINBQUUfSa88oMeFT6aSI1nWbg2ssYRP3+GaSH2pGWbc+LyBnbO2ChxWZ2qZZg4xRdtxJdL7ksConl5w8ALNvdF2rkgDyMgpkAE4GhOPdnxN5YOOhoGFDJWDjbXvFRPBjnnCd9TkZPbuT/GNOBcRdrA3udZf4nBbeL+RGpK3frw8UPABOy4Vuw+TY3REYkWr9bCsaxw2CcJBYN1dN6XnfhBVO6gdsU/8D6+PCz0vVvt+OVO/wNg1MWHI2xjFKWlbRuPyuvgEiv0SOp63bdFJ7kGjJG4KJkFVfVsdXWUhbG4Tm6w7RbrHp5bGPYuxGeiErf3jM6sJmYZlKhQSW5zg4Nh3gZP5jggt9t0MeQnL9Bb65IG8eGF7jT1YSZTJ44tTQPb6nrHgLgeT3KdiObAM87pU4I9QIu27f7dd5JbALHiTEe9YRl5N3VDkf4SPfbi/SsVkr2IrbDft4LJsAAjqOxTTzWk8LRX8XthM8zTwHk9Hdo8mfNw74ao9VMf8HlKZxb3jojIumsyk="
+      on:
-  on:
+        branch: master
-    repo: PaddiM8/kalk
+
-    branch: release
+    - stage: deploy-releases
-    skip_cleanup: 'true'
+      cache: cargo
+      if: branch = release
+      script: cargo build --verbose --manifest-path kalk_cli/Cargo.toml --release
+      deploy:
+        provider: releases
+        api_key:
+          secure: "eM+8mEZkCSACjZvN0lH31CA+fCPcTZ+oLu1y+IuQC4MMb8mD8CgV0Y+MXZZA1oLiIrUc6y4zU3ll6pjnU3RGzvlFEB2GPyctxct/a7/zJ3jaVjjFJbssBuCaKN+JTH2AK8530hOfpOujYGU68ENx6WEk/EltRJtc4C4ultHrDcX5gi05XPN8p153AFnjUXEdCAQfAA0Oy9w7/9qzidHe79pWMuqdzfCfrZ/JJRdl/mEfS98JJbzoPW2GqO+OoE+R59JN/QnZrMqlieE0yiEk2HXsbW/Mkosg49NFvOXzfQoH3MYX8YPh6xMkEl+szt8WC3rA2WIDqQMwfxr2PDmxB76+4999RAY/PrZ+WLYbCbU6rUVxK7hZ6Ljxxay9341RL04f+5jzs7kLSBZYil3uo61iRITAsgeVGD3aL6HAnOr3RarAo6o0AdtvL3kzI89GFgJLtPeIpvd8Kx7TgQ/a67vdOA577qyoOc40zBZE17zAbq3ybrRn2E3YOwPjNKdg7xULVe6gvfDSFxm5WqTcDdxT9Zna6nEn22ItDylfZfJksyTO+VDTB+nsctmFLzuccEG4xVsg12BMCDoOCXCjlakX18ri3vJea50ekBE3C7XMPiSZ3XboLo2L1dn/rBeeH9bPHEQMHFDwRDaPItxfBXu+L38jE1CMVTA5j030ADg="
+        file:
+          - "target/release/kalk_cli"
+        skip_cleanup: true
+        on:
+          repo: PaddiM8/kalk
+          branch: release
+
+    - stage: deploy-cargo
+      cache: cargo
+      script: cd kalk
+      if: branch = release
+      deploy:
+        provider: cargo
+        token:
+          secure: "YsnbCBywb3A4ACcCQc3ATHWVpsmoZtyJUIH5Q3MAb1qdaQtX7V/zPtsew0ZvIcL5jo0RPKOvTQaREvC2ShQPImn/LUoBY/DwutUvxFVLbU2Caubn0IUMYBZ/jD8AuQ6mEDn5DU/ieNH1sl0Z4+2itWwHVJsWhSQOINBQUUfSa88oMeFT6aSI1nWbg2ssYRP3+GaSH2pGWbc+LyBnbO2ChxWZ2qZZg4xRdtxJdL7ksConl5w8ALNvdF2rkgDyMgpkAE4GhOPdnxN5YOOhoGFDJWDjbXvFRPBjnnCd9TkZPbuT/GNOBcRdrA3udZf4nBbeL+RGpK3frw8UPABOy4Vuw+TY3REYkWr9bCsaxw2CcJBYN1dN6XnfhBVO6gdsU/8D6+PCz0vVvt+OVO/wNg1MWHI2xjFKWlbRuPyuvgEiv0SOp63bdFJ7kGjJG4KJkFVfVsdXWUhbG4Tm6w7RbrHp5bGPYuxGeiErf3jM6sJmYZlKhQSW5zg4Nh3gZP5jggt9t0MeQnL9Bb65IG8eGF7jT1YSZTJ44tTQPb6nrHgLgeT3KdiObAM87pU4I9QIu27f7dd5JbALHiTEe9YRl5N3VDkf4SPfbi/SsVkr2IrbDft4LJsAAjqOxTTzWk8LRX8XthM8zTwHk9Hdo8mfNw74ao9VMf8HlKZxb3jojIumsyk="
+        skip_cleanup: true
+        on:
+          repo: PaddiM8/kalk
+          branch: release

Cargo.lock

@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "kalk"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "phf",
  "regex",
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "kalk_cli"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "ansi_term",
  "kalk",

README.md

@@ -2,6 +2,7 @@
 [![Crates.io](https://img.shields.io/crates/v/kalk_cli)](https://crates.io/crates/kalk_cli)
 [![GitHub](https://img.shields.io/github/license/PaddiM8/kalk)](https://github.com/PaddiM8/kalk/blob/master/LICENSE)
 [![Docs.rs](https://docs.rs/kalk/badge.svg)](https://docs.rs/kalk/latest/kalk/)
+![Build status](https://travis-ci.org/PaddiM8/kalk.svg?branch=master)]
 
 Kalk is a calculator (both program and library) that supports user-defined variables and functions.
 

kalk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kalk"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["PaddiM8"]
 edition = "2018"
 readme = "README.md"

kalk_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kalk_cli"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["PaddiM8"]
 edition = "2018"
 readme = "../README.md"
@@ -11,7 +11,7 @@ keywords = ["math", "calculator", "cli", "command-line"]
 categories = ["mathematics", "command-line-utilities"]
 
 [dependencies]
-kalk = { path = "../kalk", version = "^0.1.3" }
+kalk = { path = "../kalk", version = "^0.1.5" }
 rustyline = "6.1.2"
 ansi_term = "0.12"
 regex = "1"