bump the master version to v1.11.0-dev

filecoin-project · May 17, 2021 · 6e57c81 · 6e57c81
1 parent 9954577
commit 6e57c81
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
diff --git a/build/version.go b/build/version.go
@@ -31,7 +31,7 @@ func buildType() string {
 }
 
 // BuildVersion is the local build version, set by build system
-const BuildVersion = "1.9.0"
+const BuildVersion = "1.11.0-dev"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

diff --git a/scripts/publish-release.sh b/scripts/publish-release.sh
@@ -39,11 +39,7 @@ if [ "${RELEASE_ID}" = "null" ]; then
   RELEASE_DATA="{
     \"tag_name\": \"${CIRCLE_TAG}\",
     \"target_commitish\": \"${CIRCLE_SHA1}\",
-<<<<<<< HEAD
-    \"discussion_category_name\": \"announcement\",
-=======
     ${COND_CREATE_DISCUSSION}
->>>>>>> master
     \"name\": \"${CIRCLE_TAG}\",
     \"body\": \"\",
     \"prerelease\": ${PRERELEASE}