ci_: run generate, update docker file deps

status-im · Oct 2, 2024 · 5becff3 · 5becff3
1 parent 8f32e57
commit 5becff3
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/_assets/build/Dockerfile b/_assets/build/Dockerfile
@@ -5,7 +5,7 @@ FROM golang:1.21-alpine3.18 as builder
 ENV CC=clang
 ENV CXX=clang++
 
-RUN apk add --no-cache make llvm clang musl-dev linux-headers
+RUN apk add --no-cache git make llvm clang musl-dev linux-headers protobuf-dev~3.21
 
 ARG build_tags
 ARG build_flags
@@ -14,6 +14,10 @@ ARG build_target=statusgo
 RUN mkdir -p /go/src/github.com/status-im/status-go
 WORKDIR /go/src/github.com/status-im/status-go
 ADD . .
+
+RUN go install go.uber.org/mock/[email protected]
+RUN go install github.com/kevinburke/go-bindata/v4/[email protected]
+RUN go install google.golang.org/protobuf/cmd/[email protected]
 RUN make $build_target BUILD_TAGS="$build_tags" BUILD_FLAGS="$build_flags" SHELL="/bin/sh"
 
 # Copy the binary to the second image

diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android
@@ -55,6 +55,16 @@ pipeline {
       }
     }
 
+    stage('Generate') {
+      environment {
+          /* Regenerate at least once */
+          GO_GENERATE_FAST_RECACHE = "true"
+      }
+      steps { script {
+        nix.shell('make generate', pure: false)
+      } }
+    }
+
     stage('Compile') {
       steps { script {
         nix.shell('make statusgo-android', pure: false)

diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios
@@ -47,6 +47,9 @@ pipeline {
     )
     /* fix for gomobile complaining about missing packages */
     CGO_ENABLED = "1"
+    /* Use `go generate`, ignore cache on CI. 
+    Also, `go-generate-fast` was struggling with some paths access and didn't work anyway */
+    GO_GENERATE_FAST = "false"
   }
 
   stages {
@@ -57,6 +60,12 @@ pipeline {
       }
     }
 
+    stage('Generate') {
+      steps { script {
+        nix.shell('make generate', pure: false)
+      } }
+    }
+
     stage('Compile') {
       steps { script {
         nix.shell('make statusgo-ios', pure: false, sandbox: false)

diff --git a/_assets/ci/Jenkinsfile.linux b/_assets/ci/Jenkinsfile.linux
@@ -55,6 +55,16 @@ pipeline {
       }
     }
 
+    stage('Generate') {
+      environment {
+          /* Regenerate at least once */
+          GO_GENERATE_FAST_RECACHE = "true"
+      }
+      steps { script {
+        nix.shell('make generate', pure: false)
+      } }
+    }
+
     /* Sanity-check C bindings */
     stage('Build Static Lib') {
       steps { script {

diff --git a/_assets/ci/Jenkinsfile.tests b/_assets/ci/Jenkinsfile.tests
@@ -94,6 +94,16 @@ pipeline {
       }
     }
 
+    stage('Generate') {
+      environment {
+          /* Regenerate at least once */
+          GO_GENERATE_FAST_RECACHE = "true"
+      }
+      steps { script {
+        nix.shell('make generate', pure: false)
+      } }
+    }
+
     stage('Vendor Check') {
       steps { script {
         nix.shell('make vendor', pure: false)
@@ -166,7 +176,6 @@ pipeline {
             "--filter",
             "--lightpush"
           ].join(' ')) { c2 ->
-            nix.shell('make generate-handlers', pure: true)
             withCredentials([
               string(
                 credentialsId: 'codeclimate-test-reporter-id',