From b86f08107d1876294474478b863bffa7ead37e9b Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Tue, 19 Nov 2024 14:36:23 -0500 Subject: [PATCH] Makefile: run version before any APK builds updates tailscle/corp#24686 We must ensure the correct version file exists before kicking off any of the apk or aab builds. This also revs the docker image so we're picking up the latest toolchain. Signed-off-by: Jonathan Nobels --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b1f2c5d7ce..2524860aea 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # with this name, it will be used. # # The convention here is tailscale-android-build-amd64- -DOCKER_IMAGE=tailscale-android-build-amd64-120924 +DOCKER_IMAGE=tailscale-android-build-amd64-191124 export TS_USE_TOOLCHAIN=1 DEBUG_APK=tailscale-debug.apk @@ -109,21 +109,21 @@ release-tv: jarsign-env $(RELEASE_TV_AAB) ## Build the release AAB .PHONY: gradle-dependencies gradle-dependencies: $(shell find android -type f -not -path "android/build/*" -not -path '*/.*') $(LIBTAILSCALE) tailscale.version -$(DEBUG_APK): gradle-dependencies +$(DEBUG_APK): version gradle-dependencies (cd android && ./gradlew test assembleDebug) install -C android/build/outputs/apk/debug/android-debug.apk $@ -$(RELEASE_AAB): gradle-dependencies +$(RELEASE_AAB): version gradle-dependencies @echo "Building release AAB" (cd android && ./gradlew test bundleRelease) install -C ./android/build/outputs/bundle/release/android-release.aab $@ -$(RELEASE_TV_AAB): gradle-dependencies +$(RELEASE_TV_AAB): version gradle-dependencies @echo "Building TV release AAB" (cd android && ./gradlew test bundleRelease_tv) install -C ./android/build/outputs/bundle/release_tv/android-release_tv.aab $@ -tailscale-test.apk: gradle-dependencies +tailscale-test.apk: version gradle-dependencies (cd android && ./gradlew assembleApplicationTestAndroidTest) install -C ./android/build/outputs/apk/androidTest/applicationTest/android-applicationTest-androidTest.apk $@