Skip to content

Commit

Permalink
fix_: add missing dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mendelskiv93 committed Oct 22, 2024
1 parent 45b1bde commit ab633eb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
go install github.com/kevinburke/go-bindata/v4/[email protected]
go install google.golang.org/protobuf/cmd/[email protected]

statusgo-android: generate
statusgo-android: ##@cross-compile Build status-go for Android
@echo "Building status-go for Android..."
Expand Down
10 changes: 9 additions & 1 deletion _assets/ci/Jenkinsfile.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 5 additions & 6 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ let
inherit (pkgs) lib stdenv callPackage;
/* No Android SDK for Darwin aarch64. */
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"];
Expand All @@ -26,10 +28,7 @@ in pkgs.mkShell {
git jq which
go golangci-lint go-junit-report gopls go-bindata gomobileMod codecov-cli go-generate-fast
mockgen protobuf3_20 protoc-gen-go gotestsum go-modvendor openjdk cc-test-reporter
] ++ lib.optionals (stdenv.isDarwin) [ xcodeWrapper ]
++ lib.optionals (isMacIntel) [
pkgs.darwin.apple_sdk.libs.xpc
];
] ++ lib.optionals (stdenv.isDarwin) [ xcodeWrapper ];

shellHook = lib.optionalString (!isMacM1) ''
ANDROID_HOME=${pkgs.androidPkgs.androidsdk}/libexec/android-sdk
Expand Down

0 comments on commit ab633eb

Please sign in to comment.