Commit 33fc3431 authored by mdj33's avatar mdj33 Committed by 33cn

rmv relay from ci temperary

parent a08dac94
all:
chmod +x ./build.sh
./build.sh $(OUT) $(FLAG)
\ No newline at end of file
#!/bin/sh
strpwd=$(pwd)
strcmd=${strpwd##*dapp/}
strapp=${strcmd%/cmd*}
OUT_DIR="${1}/$strapp"
#FLAG=$2
mkdir -p "${OUT_DIR}"
cp ./build/* "${OUT_DIR}"
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
package cmd package command
import ( import (
"fmt" "fmt"
......
...@@ -2,12 +2,12 @@ package js ...@@ -2,12 +2,12 @@ package js
import ( import (
"github.com/33cn/chain33/pluginmgr" "github.com/33cn/chain33/pluginmgr"
"github.com/33cn/plugin/plugin/dapp/js/cmd"
"github.com/33cn/plugin/plugin/dapp/js/executor" "github.com/33cn/plugin/plugin/dapp/js/executor"
ptypes "github.com/33cn/plugin/plugin/dapp/js/types" ptypes "github.com/33cn/plugin/plugin/dapp/js/types"
// init auto test // init auto test
_ "github.com/33cn/plugin/plugin/dapp/js/autotest" _ "github.com/33cn/plugin/plugin/dapp/js/autotest"
"github.com/33cn/plugin/plugin/dapp/js/command"
) )
func init() { func init() {
...@@ -15,7 +15,7 @@ func init() { ...@@ -15,7 +15,7 @@ func init() {
Name: ptypes.JsX, Name: ptypes.JsX,
ExecName: executor.GetName(), ExecName: executor.GetName(),
Exec: executor.Init, Exec: executor.Init,
Cmd: cmd.JavaScriptCmd, Cmd: command.JavaScriptCmd,
RPC: nil, RPC: nil,
}) })
} }
...@@ -9,6 +9,6 @@ SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd ...@@ -9,6 +9,6 @@ SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd
FLAG=$2 FLAG=$2
# shellcheck disable=SC2086 # shellcheck disable=SC2086
go build -i ${FLAG} -v -o "${OUT_DIR}/relayd" "${SRC_RELAYD}" #go build -i ${FLAG} -v -o "${OUT_DIR}/relayd" "${SRC_RELAYD}"
cp ./relayd/relayd.toml "${OUT_DIR}/relayd.toml" #cp ./relayd/relayd.toml "${OUT_DIR}/relayd.toml"
cp ./build/* "${OUT_DIR}" #cp ./build/* "${OUT_DIR}"
...@@ -170,6 +170,7 @@ function relay_test() { ...@@ -170,6 +170,7 @@ function relay_test() {
coinaddr=$(${1} tx query -s "${buy_hash}" | jq -r ".receipt.logs[2].log.coinAddr") coinaddr=$(${1} tx query -s "${buy_hash}" | jq -r ".receipt.logs[2].log.coinAddr")
if [ "${coinaddr}" != "1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT" ]; then if [ "${coinaddr}" != "1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT" ]; then
${1} tx query -s "${buy_hash}"
echo "wrong create order to coinaddr" echo "wrong create order to coinaddr"
exit 1 exit 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment