Skip to content

Commit

Permalink
Do not enforce go version in Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
myleshorton committed Nov 19, 2023
1 parent 946ef1a commit 11fe034
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ TEST ?= *_test
# integration-test:
# @flutter drive --driver test_driver/integration_driver.dart --debug --flavor prod --target `ls integration_test/$(TEST).dart`

GO_VERSION := 1.19

TAG ?= $$VERSION
TAG_HEAD := $(shell git rev-parse HEAD)
INSTALLER_NAME ?= lantern-installer
Expand Down Expand Up @@ -205,12 +203,6 @@ tag: require-version
git commit -m "Updated changelog for $$VERSION" && \
git push

define check-go-version
if [ -z '${IGNORE_GO_VERSION}' ] && go version | grep -q -v $(GO_VERSION); then \
echo "go $(GO_VERSION) is required." && exit 1; \
fi
endef

guard-%:
@ if [ -z '${${*}}' ]; then echo 'Environment variable $* not set' && exit 1; fi

Expand Down Expand Up @@ -272,7 +264,6 @@ release-autoupdate: require-version
release: require-version require-s3cmd require-wget require-lantern-binaries require-release-track release-prod copy-beta-installers-to-mirrors invalidate-getlantern-dot-org upload-aab-to-play

$(ANDROID_LIB):
$(call check-go-version) && \
go env -w 'GOPRIVATE=github.com/getlantern/*' && \
go install golang.org/x/mobile/cmd/gomobile && \
gomobile init && \
Expand Down Expand Up @@ -327,7 +318,6 @@ pubget:
@flutter pub get

$(MOBILE_DEBUG_APK): $(MOBILE_SOURCES) $(GO_SOURCES)
@$(call check-go-version) && \
make do-android-debug && \
cp $(MOBILE_ANDROID_DEBUG) $(MOBILE_DEBUG_APK)

Expand Down Expand Up @@ -471,7 +461,3 @@ clean:
rm -f `which gomobile` && \
rm -f `which gobind`
rm -Rf "$(FLASHLIGHT_FRAMEWORK_PATH)" "$(INTERMEDIATE_FLASHLIGHT_FRAMEWORK_PATH)"




0 comments on commit 11fe034

Please sign in to comment.