From 723b8e8905a906528ccb235b5ab2eeda995bb992 Mon Sep 17 00:00:00 2001 From: William Petit Date: Fri, 26 Apr 2024 15:28:24 +0200 Subject: [PATCH] ci: fix missing mktools dependency --- Jenkinsfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d4cf42..ae4e50e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ standardMakePipeline([ 'extras;google;google_play_services' ''', 'hooks': [ - 'pre-release': { + 'pre-build': { sh ''' make .mktools ''' diff --git a/Makefile b/Makefile index 7bdad1a..f34ad72 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ build-client: deps ## Build executable -o ./bin/client \ ./cmd/client -build-android: tools/gogio/bin/gogio deps ## Build executable +build-android: .mktools tools/gogio/bin/gogio deps ## Build executable mkdir -p dist CGO_ENABLED=1 GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile ( cd android && VERSION_NAME=$(MKT_PROJECT_VERSION)-debug ./gradlew assembleDebug )