change to 0.1.0-alpha.4

oasislabs · May 3, 2018 · bcb627d · bcb627d
1 parent ea092a8
commit bcb627d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,14 +11,13 @@ jobs:
       - checkout
 
       # Install Ekiden binaries.
-      # %%% change --branch ... to --tag ...
       - run:
           environment:
             CARGO_TARGET_DIR: target
           command: >-
             cargo install
             --git https://github.com/oasislabs/ekiden
-            --branch pro-wh/feature/targetpath
+            --tag 0.1.0-alpha.4
             --debug
             ekiden-tools
       - run:
@@ -27,7 +26,7 @@ jobs:
           command: >-
             cargo install
             --git https://github.com/oasislabs/ekiden
-            --branch pro-wh/feature/targetpath
+            --tag 0.1.0-alpha.4
             --debug
             ekiden-compute
       - run:
@@ -36,15 +35,14 @@ jobs:
           command: >-
             cargo install
             --git https://github.com/oasislabs/ekiden
-            --branch pro-wh/feature/targetpath
+            --tag 0.1.0-alpha.4
             --debug
             ekiden-consensus
       # Build key manager contract.
-      # %%% change --branch ... to --tag ...
       - run: >-
           cargo ekiden build-contract
           --git https://github.com/oasislabs/ekiden
-          --branch pro-wh/feature/targetpath
+          --tag 0.1.0-alpha.4
           --output target/contract
           --target-dir "$PWD/target"
           ekiden-key-manager

diff --git a/Cargo.toml b/Cargo.toml
@@ -10,12 +10,10 @@ etcommon-hexutil = { version = "0.2", default-features = false }
 sha3 = "0.6"
 sputnikvm = { version = "0.9", default-features = false }
 evm-api = { path = "./api" }
-# %%% change branch = ... to tag = ...
-ekiden-core = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
-ekiden-trusted = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
+ekiden-core = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
+ekiden-trusted = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
 protobuf = "1.4.3"
 
 [build-dependencies]
-# %%% change branch = ... to tag = ...
-ekiden-tools = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
-ekiden-edl = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
+ekiden-tools = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
+ekiden-edl = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -5,10 +5,8 @@ authors = ["Oasis Labs Inc. <[email protected]>"]
 build = "build.rs"
 
 [dependencies]
-# %%% change branch = ... to tag = ...
-ekiden-core = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
+ekiden-core = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
 protobuf = "1.4.3"
 
 [build-dependencies]
-# %%% change branch = ... to tag = ...
-ekiden-tools = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
+ekiden-tools = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -7,10 +7,9 @@ authors = ["Oasis Labs Inc. <[email protected]>", "Wei Tang <[email protected]>"]
 
 ## Ekiden client dependencies
 
-# %%% change branch = ... to tag = ...
-client-utils = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
-ekiden-core = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
-ekiden-rpc-client = { git = "https://github.com/oasislabs/ekiden", branch = "pro-wh/feature/targetpath" }
+client-utils = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
+ekiden-core = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
+ekiden-rpc-client = { git = "https://github.com/oasislabs/ekiden", tag = "0.1.0-alpha.4" }
 evm-api = { path = "../api" }
 clap = "2.29.1"
 rand = "0.4"

diff --git a/docker/deployment/build-images-inner.sh b/docker/deployment/build-images-inner.sh
@@ -15,9 +15,8 @@ EOF
 fi
 
 # Build all Ekiden binaries and resources.
-# %%% change --branch ... to --tag ...
-CARGO_TARGET_DIR=target cargo install --force --git https://github.com/oasislabs/ekiden --branch pro-wh/feature/targetpath ekiden-tools
-cargo ekiden build-contract --git https://github.com/oasislabs/ekiden --branch pro-wh/feature/targetpath --output target/contract --target-dir target --release ekiden-key-manager
+CARGO_TARGET_DIR=target cargo install --force --git https://github.com/oasislabs/ekiden --tag 0.1.0-alpha.4 ekiden-tools
+cargo ekiden build-contract --git https://github.com/oasislabs/ekiden --tag 0.1.0-alpha.4 --output target/contract --target-dir target --release ekiden-key-manager
 cargo ekiden build-contract --release --output-identity
 (cd client && CARGO_BUILD_TARGET_DIR=../target cargo build --release)