ci: git reset between commits to avoid version conflict due to go.mod…

… update
skydive-project · Sep 27, 2019 · 9b8e602 · 9b8e602
1 parent 7c97b43
commit 9b8e602
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 101 deletions.
diff --git a/api/types/types_easyjson.go b/api/types/types_easyjson.go
diff --git a/scripts/ci/run-compile-tests.sh b/scripts/ci/run-compile-tests.sh
@@ -17,32 +17,40 @@ COLLECTD_SRC=/tmp/collectd make contribs
 
 # Compile with default options
 make
+
+git reset --hard
 make test.functionals.compile TAGS=${TAGS}
 
 export CGO_CFLAGS="-I/usr/local/include/dpdk -O3 -g -std=gnu11 -m64 -pthread -march=native -DRTE_MACHINE_CPUFLAG_SSE -DRTE_MACHINE_CPUFLAG_SSE2 -DRTE_MACHINE_CPUFLAG_SSE3 -DRTE_MACHINE_CPUFLAG_SSSE3 -DRTE_MACHINE_CPUFLAG_SSE4_1 -DRTE_MACHINE_CPUFLAG_SSE4_2 -DRTE_MACHINE_CPUFLAG_PCLMULQDQ -DRTE_MACHINE_CPUFLAG_RDRAND -DRTE_MACHINE_CPUFLAG_FSGSBASE -DRTE_MACHINE_CPUFLAG_F16C -include rte_config.h -Wno-deprecated-declarations"
 export CGO_LDFLAGS="-L/usr/local/lib"
 
 # Compile with all build options supported enabled
+git reset --hard
 make WITH_DPDK=true WITH_EBPF=true WITH_VPP=true WITH_EBPF_DOCKER_BUILDER=true WITH_K8S=true WITH_ISTIO=true \
     WITH_HELM=true VERBOSE=true
 
 # Compile Skydive for Windows
+git reset --hard
 GO111MODULE=on GOOS=windows GOARCH=amd64 go build github.com/skydive-project/skydive
 
 # Compile Skydive for MacOS
+git reset --hard
 GO111MODULE=on GOOS=darwin GOARCH=amd64 go build github.com/skydive-project/skydive
 
 # Compile profiling
+git reset --hard
 make WITH_PROF=true VERBOSE=true
 
 make clean
 
 # Compile all tests
+git reset --hard
 make test.functionals.compile TAGS=${TAGS} WITH_NEUTRON=true WITH_SELENIUM=true WITH_CDD=true \
     WITH_SCALE=true WITH_EBPF=true WITH_EBPF_DOCKER_BUILDER=true WITH_VPP=true WITH_K8S=true \
     WITH_ISTIO=true WITH_HELM=true
 
 make clean
 
 # Compile static
+git reset --hard
 make static