Skip to content

Commit

Permalink
update version to 1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@MandssS
MandssS committed Sep 6, 2022
1 parent 6c8c360 commit 47479df
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 44 deletions.
28 changes: 5 additions & 23 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build clean

export BLADE_VERSION=1.6.1
export BLADE_VERSION=1.7.0

ALLOWGITVERSION=1.8.5
GITVERSION:=$(shell git --version | grep ^git | sed 's/^.* //g')
Expand All @@ -17,13 +17,12 @@ GO_ENV=CGO_ENABLED=1
GO_MODULE=GO111MODULE=on
VERSION_PKG=github.com/chaosblade-io/chaosblade/version
# Specify chaosblade version in docker experiments
DOCKER_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-docker/version
CRI_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-cri/version
OS_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-os/version
JVM_BLADE_VERSION=github.com/chaosblade-io/chaosblade-exec-jvm/version
K8S_BLADE_VERSION=github.com/chaosblade-io/chaosblade-operator/version

GO_X_FLAGS=-X ${VERSION_PKG}.Ver=$(BLADE_VERSION) -X '${VERSION_PKG}.Env=`uname -mv`' -X '${VERSION_PKG}.BuildTime=`date`' -X ${DOCKER_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${CRI_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${OS_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${JVM_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${K8S_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION)
GO_X_FLAGS=-X ${VERSION_PKG}.Ver=$(BLADE_VERSION) -X '${VERSION_PKG}.Env=`uname -mv`' -X '${VERSION_PKG}.BuildTime=`date`' -X ${CRI_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${OS_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${JVM_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION) -X ${K8S_BLADE_VERSION}.BladeVersion=$(BLADE_VERSION)
GO_FLAGS=-ldflags="$(GO_X_FLAGS) -s -w"
GO=env $(GO_ENV) $(GO_MODULE) go

Expand All @@ -49,10 +48,6 @@ BUILD_TARGET_CACHE=$(BUILD_TARGET)/cache
BLADE_EXEC_OS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-os.git
BLADE_EXEC_OS_BRANCH=master

# chaosblade-exec-docker
BLADE_EXEC_DOCKER_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-docker.git
BLADE_EXEC_DOCKER_BRANCH=v1.5.0

# chaosblade-exec-cri
BLADE_EXEC_CRI_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cri.git
BLADE_EXEC_CRI_BRANCH=main
Expand All @@ -69,17 +64,13 @@ BLADE_EXEC_JVM_BRANCH=master
BLADE_EXEC_CPLUS_PROJECT=https://github.com/chaosblade-io/chaosblade-exec-cplus.git
BLADE_EXEC_CPLUS_BRANCH=master

# docker yaml
DOCKER_YAML_FILE_NAME=chaosblade-docker-spec-$(BLADE_VERSION).yaml
DOCKER_YAML_FILE_PATH=$(BUILD_TARGET_BIN)/$(DOCKER_YAML_FILE_NAME)

# cri yaml
CRI_YAML_FILE_NAME=chaosblade-cri-spec-$(BLADE_VERSION).yaml
CRI_YAML_FILE_PATH=$(BUILD_TARGET_BIN)/$(CRI_YAML_FILE_NAME)

# check yaml
CHECK_YAML_FILE_NAME=chaosblade-check-spec-$(BLADE_VERSION).yaml
CHECK_YANL_FILE_OSS=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/agent/github/$(BLADE_VERSION)/$(CHECK_YAML_FILE_NAME)
CHECK_YANL_FILE_OSS=https://chaosblade.oss-cn-hangzhou.aliyuncs.com/agent/github/chaosblade-check-spec.yaml
CHECK_YAML_FILE_PATH=$(BUILD_TARGET_YAML)/$(CHECK_YAML_FILE_NAME)

ifeq ($(GOOS), linux)
Expand All @@ -106,10 +97,10 @@ build_with_linux_arm: pre_build build_linux_arm_with_arg ## Select scenario buil

# build chaosblade linux version by docker image
build_linux: ## Build linux version of all scenarios by docker image
make build_with_linux ARGS="cli os docker cri nsexec kubernetes java cplus check_yaml" upx package
make build_with_linux ARGS="cli os cri nsexec kubernetes java cplus check_yaml" upx package

build_linux_arm: ## Build linux arm version of all scenarios by docker image
make build_with_linux_arm ARGS="cli os docker cri nsexec kubernetes java cplus check_yaml" upx package
make build_with_linux_arm ARGS="cli os cri nsexec kubernetes java cplus check_yaml" upx package

build_darwin: pre_build cli os cri cplus java kubernetes upx package check_yaml ## Build all scenarios darwin version

Expand Down Expand Up @@ -141,15 +132,6 @@ endif
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-os/$(BUILD_TARGET_BIN)/* $(BUILD_TARGET_BIN)
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-os/$(BUILD_TARGET_YAML)/* $(BUILD_TARGET_YAML)

docker: ## Build docker experimental scenarios.
ifneq ($(BUILD_TARGET_CACHE)/chaosblade-exec-docker, $(wildcard $(BUILD_TARGET_CACHE)/chaosblade-exec-docker))
git clone -b $(BLADE_EXEC_DOCKER_BRANCH) $(BLADE_EXEC_DOCKER_PROJECT) $(BUILD_TARGET_CACHE)/chaosblade-exec-docker
else
git -C $(BUILD_TARGET_CACHE)/chaosblade-exec-docker pull origin $(BLADE_EXEC_DOCKER_BRANCH)
endif
make -C $(BUILD_TARGET_CACHE)/chaosblade-exec-docker
cp $(BUILD_TARGET_CACHE)/chaosblade-exec-docker/$(BUILD_TARGET_YAML)/* $(BUILD_TARGET_YAML)

kubernetes: ## Build kubernetes experimental scenarios.
ifneq ($(BUILD_TARGET_CACHE)/chaosblade-operator, $(wildcard $(BUILD_TARGET_CACHE)/chaosblade-operator))
git clone -b $(BLADE_OPERATOR_BRANCH) $(BLADE_OPERATOR_PROJECT) $(BUILD_TARGET_CACHE)/chaosblade-operator
Expand Down
2 changes: 1 addition & 1 deletion build/spec/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/chaosblade-io/chaosblade/cli/cmd"
)

var version = "1.6.1"
var version = "1.7.0"

func main() {

Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/chaosblade-io/chaosblade
go 1.13

require (
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983
github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd
github.com/chaosblade-io/chaosblade-spec-go v1.6.0
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0
github.com/chaosblade-io/chaosblade-exec-os v1.7.0
github.com/chaosblade-io/chaosblade-operator v1.7.0
github.com/chaosblade-io/chaosblade-spec-go v1.7.0
github.com/mattn/go-sqlite3 v1.10.1-0.20190217174029-ad30583d8387
github.com/olekukonko/tablewriter v0.0.5-0.20201029120751-42e21c7531a3
github.com/shirou/gopsutil v3.21.8-0.20210816101416-f86a04298073+incompatible
Expand Down
24 changes: 8 additions & 16 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,14 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e h1:ZF05b4HKrg3vKe6b0QI9UxtebZ3M8ZS3fNW/A7/z598=
github.com/chaosblade-io/chaosblade-exec-cri v1.5.1-0.20220429064319-1baacd4efc7e/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983 h1:cdztcdV7ZGbQ6Jkm3Ek6hUB7HqKYK8U6B28ZUxamwck=
github.com/chaosblade-io/chaosblade-exec-cri v1.6.1-0.20220624081117-892e8ba08983/go.mod h1:ntY1QmFauHvQ6jIuAeJXjDoaNxuQxi6lmzodBsScZbc=
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4 h1:L1S4syQy85xfC+Yb7S88DIkdYrRyJV1Rqq5GfBYwbKg=
github.com/chaosblade-io/chaosblade-exec-os v1.5.1-0.20220426025253-6d1640d20ae4/go.mod h1:UNDuSGNygBqqGVxUMhCL56BwK/up53bz8qKVOdEEyFE=
github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31 h1:QCCKsDQJEikN+MhNXbLjz4hBmR1Ldvphz5Hy548YGiI=
github.com/chaosblade-io/chaosblade-exec-os v1.6.1-0.20220624033144-ee86ca0c3a31/go.mod h1:UNDuSGNygBqqGVxUMhCL56BwK/up53bz8qKVOdEEyFE=
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc h1:flvATfoh6jsf8vViEyIJkwmhJHfgJV6OzUdbY/Gm9e4=
github.com/chaosblade-io/chaosblade-operator v1.5.1-0.20220429080716-d91b82573cbc/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd h1:dxp0Qo7ounoxnhjH/aVmztpr8haoIolv3Z9DwRqJU2A=
github.com/chaosblade-io/chaosblade-operator v1.6.1-0.20220624033356-cdb8ba30adfd/go.mod h1:oEXBsPLe6eYQV3/cctw9u2Skye7erXOx+OVJshtgR/0=
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300 h1:zHZkTkuMHbeSOZ/vXYgo+0p/qFfLaXQdwKyAFh75hyA=
github.com/chaosblade-io/chaosblade-spec-go v1.5.1-0.20220423030509-6d8dbd90b300/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
github.com/chaosblade-io/chaosblade-spec-go v1.6.0 h1:IF77oiLJzJhZc/hT71TMscneXKCrcjv8WEAQhl+scs8=
github.com/chaosblade-io/chaosblade-spec-go v1.6.0/go.mod h1:977aR5J4BBfLtFkYZkbHv1i7NJYN1X0x85xO3b8YLpc=
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0 h1:TOqA0UZS317dISb3nTwGR1Dlyr0HqsrwT5buamjZ20I=
github.com/chaosblade-io/chaosblade-exec-cri v1.7.0/go.mod h1:ka3BMJWLJd18DXt8no68WcYD8oVuhN5GeCyDf8uFK3s=
github.com/chaosblade-io/chaosblade-exec-os v1.7.0 h1:Y0V4a2LqGwVxqvVORGkXS6Y9xx1CuTWhihneGmrdAAY=
github.com/chaosblade-io/chaosblade-exec-os v1.7.0/go.mod h1:e8TuopYAESkl5ZgSjfnDL03KwO09tmA1H6Y8oPNZElw=
github.com/chaosblade-io/chaosblade-operator v1.7.0 h1:MBSsDTvisePhhtKzP9F7eTy4O2qvS4PghCQmPAggaT0=
github.com/chaosblade-io/chaosblade-operator v1.7.0/go.mod h1:XLB6bqrHuuhmY8kRyF0b55+jwgCgJwI3w+oIMfY5mHc=
github.com/chaosblade-io/chaosblade-spec-go v1.7.0 h1:kmh5I9ludZW9GNYEjkk1NLKEYJqtZSxLAojrbs4kOow=
github.com/chaosblade-io/chaosblade-spec-go v1.7.0/go.mod h1:GMDRCEt9jw2+PdX+S2eKBg4ES6PENRc7xsLohWJWM6s=
github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
Expand Down

0 comments on commit 47479df

Please sign in to comment.