Merge pull request #820 from FactomProject/FD-821_release_candidate_p…

…archment Promote FD-821 (parchment release candidate 2) to develop
FactomProject · Jul 26, 2019 · 5f01028 · 5f01028
2 parents c1cc53a + c109e7f
commit 5f01028
Show file tree

Hide file tree

Showing 149 changed files with 5,573 additions and 1,804 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,121 +25,62 @@ jobs:
           name: Get goveralls
           command: |
             go get github.com/mattn/goveralls
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
       - run:
           name: Get the dependencies
           command: |
             glide install
       - run:
           name: Build and install the executable
-          command: go install -v
+          command: go install -v && cp -r $GOPATH/ /tmp
+
+      - persist_to_workspace:
+          root: /tmp
+          paths: go
 
       - save_cache:
           key: v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
           paths:
             - vendor
 
   test:
-    working_directory: /go/src/github.com/FactomProject/factomd
+    working_directory: /tmp
     docker:
       - image: circleci/golang:1.10
 
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-            - v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
+    parallelism: 8
 
-      - run:
-          name: Get glide
-          command: |
-            go get -v github.com/Masterminds/glide
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
-      - run:
-          name: Get goveralls
-          command: |
-            go get github.com/mattn/goveralls
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
-      - run:
-          name: Get the dependencies
-          command: |
-            glide install
-      - run:
-          name: Build and install the executable
-          command: go install -v
+    steps:
+      - attach_workspace:
+          at: /tmp
 
       - run:
-          name: Run tests!
+          name: Run Tests!
           no_output_timeout: 2400
-          command: ./test.sh
-
-
-      - save_cache:
-          key: v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
-          paths:
-            - vendor
+          command: |
+            export PATH="/tmp/go/bin:$PATH"
+            export GOPATH=/tmp/go
+            cd /tmp/go/src/github.com/FactomProject/factomd/
+            ./test.sh
 
   coveralls:
-    working_directory: /go/src/github.com/FactomProject/factomd
+    working_directory: /tmp
     docker:
       - image: circleci/golang:1.10
 
     steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-            - v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
-
-      - run:
-          name: Get glide
-          command: |
-            go get -v github.com/Masterminds/glide
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
-      - run:
-          name: Get goveralls
-          command: |
-            go get github.com/mattn/goveralls
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
-      - run:
-          name: Get the dependencies
-          command: |
-            glide install
-      - run:
-          name: Build and install the executable
-          command: go install -v
+      - attach_workspace:
+          at: /tmp
 
       - run:
           name: Go Test with Coverage
           no_output_timeout: 2400
-          command: go test $(glide nv | grep -v Utilities | grep -v LongTests  | grep -v simTest) -vet=off -v -cover -coverprofile=coverage.out
-
-      - run:
-          name: Coveralls!
-          no_output_timeout: 2400
-          command: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
-
-#      - run:
-#          name: Coveralls!
-#          no_output_timeout: 2400
-#          command: goveralls -v -flags "-vet=off" -ignore=$(paste -sd, .coverignore) -service=circle-ci -repotoken=$COVERALLS_TOKEN
-
-
-      - save_cache:
-          key: v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
-          paths:
-            - vendor
+          command: |
+            export PATH="/tmp/go/bin:$PATH"
+            export GOPATH=/tmp/go
+            cd /tmp/go/src/github.com/FactomProject/factomd/
+            go test $(glide nv | grep -v Utilities | grep -v longTest | grep -v peerTest | grep -v simTest | grep '...') -vet=off -v -cover -coverprofile=coverage.out
+            goveralls -coverprofile=coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
+            bash -c "exit 0" # coverage should never fail
 
 
   # Docker builds

diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,3 @@
 # Don't copy the glide vendor directory
-vendor
+vendor
+.sim 
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+# Special build files
+engine/overrideversion.go
 # Executable
 factomd
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
@@ -53,3 +55,4 @@ _testmain.go
 
 # Vendoring
 vendor/
+.sim
diff --git a/CLA b/CLA
@@ -43,3 +43,4 @@ Niels Klomp                                nklomp
 Clay Douglass                              factom-clay                                  Factom Inc.
 Sander Postma                              sanderPostma                                 AtomicVoid, Sphereon BV, BIF
 Tor Hogne Paulsen                          Tor Hogne                                    The 42nd Factoid AS, TFA                     Factom Protocol Guide
+Steven Masley                              Emyrk                                        Factom Inc.