change build action

Signed-off-by: Fedor Partanskiy <[email protected]>

Author: pfi79

.github/workflows/build.yml

@@ -1,11 +1,64 @@
 name: Build
 
 on:
+  push:
+    branches: [ "**" ]
   pull_request:
+    branches: [ "**" ]
+  workflow_dispatch:
+
+env:
+  GO_VER: 1.24.1
+  PROTOC_VER: 29.3
+  PROTOC_GEN_GO_VER: v1.36.5
 
 jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout Code
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VER }}
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          version: ${{ env.PROTOC_VER }}
+
+      - name: check go.mod
+        run: |
+          go mod tidy
+          git diff --exit-code go.mod
+
+      - name: check vendor
+        run: |
+          go mod vendor
+          git diff --exit-code
+
+      - name: go fmt
+        run: |
+          go fmt ./...
+          git diff --exit-code
+
+      - name: goimports
+        run: |
+          go install golang.org/x/tools/cmd/goimports@latest
+          goimports -l -w `find . -name '*.go' | grep -v vendor | grep -v 'pb.go'`
+          git diff --exit-code
+
+      - name: check protobuf
+        run: |
+          go install google.golang.org/protobuf/cmd/protoc-gen-go@${{ env.PROTOC_GEN_GO_VER }}
+          make protos
+          git diff --exit-code
 
   build:
+    needs:
+      - validate
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -14,15 +67,8 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.4
-
-    - name: Prepare Env
-      run: bash scripts/prepare_environ.sh
+        go-version: ${{ env.GO_VER }}
 
     - name: Test
-      working-directory: /home/runner/go/src/github.com/hyperledger-labs/SmartBFT
-      run:  make all
-
-    - name: Post
-      working-directory: /home/runner/go/src/github.com/hyperledger-labs/SmartBFT
-      run: ./scripts/post.sh
+      run: |
+        go test -count 1 -race ./...

Makefile

@@ -5,4 +5,5 @@ all:
 	bash ./scripts/build_checks.sh
 protos: 
 	protoc --go_opt=paths=source_relative --go_out=. smartbftprotos/*.proto
-	find . -name "*.pb.go" | grep -v "^./vendor" | xargs goimports -w
+	protoc --go_opt=paths=source_relative --go_out=. examples/naive_chain/*.proto
+	protoc --go_opt=paths=source_relative --go_out=. test/*.proto

examples/naive_chain/test_message.pb.go

@@ -10,21 +10,21 @@ err() {
 
 echo -e "\nTesting commit: ------${ANSI_GREEN}" $(git log -1 --no-merges | head -$(( $(git log -1 --no-merges | wc -l) - 2 )) | tail -1) "${ANSI_RESET}------\n"
 
-go get -u golang.org/x/tools/cmd/goimports
-go get -u google.golang.org/protobuf/cmd/protoc-gen-go
-
+go install golang.org/x/tools/cmd/goimports@latest
+go install google.golang.org/protobuf/cmd/[email protected]
 
 BUILDDIR=.build
 if [ ! -d "$BUILDDIR" ]; then
     mkdir $BUILDDIR
 fi
 cd $BUILDDIR
 
-PROTOC_ZIP=protoc-3.8.0-linux-x86_64.zip
+PROTOC_VER=29.3
+PROTOC_ZIP=protoc-$PROTOC_VER-linux-x86_64.zip
 if [ ! -f "$PROTOC_ZIP" ]; then
     echo "$PROTOC_ZIP does not exist"
-    wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.3/protoc-3.12.3-linux-x86_64.zip
-    unzip protoc-3.12.3-linux-x86_64.zip
+    wget https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VER/$PROTOC_ZIP
+    unzip $PROTOC_ZIP
 fi
 
 export PATH=$PATH:$BUILDDIR/bin/
@@ -52,13 +52,13 @@ else
 fi
 
 make protos
-# git status | grep "pb.go" | grep -q "modified"
-# if [ $? -eq 0 ];then
-# 	git status
-# 	err "protobuf not up to date"
-# 	git diff
-# 	exit 1
-# fi
+git status | grep "pb.go" | grep -q "modified"
+if [ $? -eq 0 ];then
+    git status
+    err "protobuf not up to date"
+    git diff
+    exit 1
+fi
 
 ( sleep 600; ps -ef | grep test | grep -v "go test" | grep -v grep | awk '{print $2}' | xargs kill -SIGABRT ) &