diff --git a/Makefile b/Makefile index 9ebd422ee53..fe5cfa1a1ac 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,11 @@ statusgo-cross: statusgo-android statusgo-ios @echo "Full cross compilation done." @ls -ld build/bin/statusgo-* +status-go-deps: + go install go.uber.org/mock/mockgen@v0.4.0 + go install github.com/kevinburke/go-bindata/v4/...@v4.0.2 + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1 + statusgo-android: generate statusgo-android: ##@cross-compile Build status-go for Android @echo "Building status-go for Android..." diff --git a/_assets/ci/Jenkinsfile.desktop b/_assets/ci/Jenkinsfile.desktop index 31a0f24feba..4f173ab94df 100644 --- a/_assets/ci/Jenkinsfile.desktop +++ b/_assets/ci/Jenkinsfile.desktop @@ -67,11 +67,19 @@ pipeline { } } + stage('Deps') { + steps { script { + shell('make status-go-deps') + } + } + } + stage('Generate') { steps { script { shell('make generate') - } } + } } + } stage('Build Static Lib') { steps { diff --git a/nix/shell.nix b/nix/shell.nix index a6da3dc748e..6d985f04d07 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -7,7 +7,10 @@ let isMacM1 = stdenv.isDarwin && stdenv.isAarch64; isMacIntel = stdenv.isDarwin && stdenv.isx86_64; - apple_sdk = pkgs.darwin.apple_sdk.override { version = "11.0"; }; + appleSdk11Stdenv = pkgs.overrideSDK pkgs.stdenv "11.0"; + sdk11mkShell = pkgs.mkShell.override { stdenv = appleSdk11Stdenv; }; + mkShell = if stdenv.isDarwin then sdk11mkShell else pkgs.mkShell; + /* Lock requires Xcode verison. */ xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { versions = ["14.3" "15.1" "15.2" "15.3" "15.4"];