Merge branch 'master' of github.com:web3eye-io/Web3Eye

web3eye-io · Oct 8, 2023 · e240638 · e240638
2 parents 2bd64af + 198e9a2
commit e240638
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -210,9 +210,7 @@ pipeline {
           env.TAG_VERSION = sh(returnStdout: true,
             script: 'git tag|grep \'[13579]$\'|tail -n 1'
             )
-             echo "Git committer email: ${TAG_VERSION}"
         }
-
       }
     }
 
@@ -230,9 +228,13 @@ pipeline {
           // sync remote tags
           git tag -l | xargs git tag -d
           git fetch origin --prune
-          TAG_VERSION=``git tag|grep '[02468]$'|tail -n 1`
         '''.stripIndent())
-        sh ''
+
+        script {
+          env.TAG_VERSION = sh(returnStdout: true,
+            script: 'git tag|grep \'[02468]$\'|tail -n 1'
+            )
+        }
       }
     }
 
@@ -250,8 +252,8 @@ pipeline {
           git reset --hard
           git checkout $TAG_VERSION
         '''.stripIndent())
-        sh 'TAG=$TAG_VERSION make build'
-        sh 'TAG=$TAG_VERSION DOCKER_REGISTRY=$DOCKER_REGISTRY make build-docker'
+        sh 'TAG="$TAG_VERSION" make build'
+        sh 'TAG="$TAG_VERSION" DOCKER_REGISTRY=$DOCKER_REGISTRY make build-docker'
       }
     }
 

diff --git a/Makefile b/Makefile
@@ -82,10 +82,11 @@ endif
 
 dealer: ./dealer/output/linux/amd64/lotus ./dealer/output/linux/amd64/ipfs
 
-build: ./extern/filecoin-ffi/filcrypto.pc $(PROJECTS) ## Build project
-	@for x in $(PROJECTS); do \
-		${REPO_ROOT}/$${x}/script/build.sh $(TAG);\
-	done
+build: 
+# ./extern/filecoin-ffi/filcrypto.pc ## Build project
+# 	@for x in $(PROJECTS); do \
+# 		${REPO_ROOT}/$${x}/script/build.sh $(TAG);\
+# 	done
 
 build-docker:
 	@for x in $(PROJECTS); do \