Makefile: fix clean action dependencies

The explicit target was removed during patch production, but the
dependency wasn't removed from the clean action.

Updates #546
Updates tailscale/tailscale#13850

Signed-off-by: James Tucker <james@tailscale.com>
kari/bumposs
James Tucker 2 weeks ago committed by James Tucker
parent c1ef8b5f20
commit e89c259749

@ -6,7 +6,7 @@ on:
- main - main
pull_request: pull_request:
branches: branches:
- '*' - "*"
jobs: jobs:
build: build:
@ -15,20 +15,23 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')" if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps: steps:
- name: Check out code
uses: actions/checkout@v3
- uses: actions/setup-go@v5
with:
go-version-file: "go.mod"
- name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest
uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "17"
- name: Check out code # Clean should essentially be a no-op, but make sure that it works.
uses: actions/checkout@v3 - name: Clean
- uses: actions/setup-go@v5 run: make clean
with:
go-version-file: 'go.mod'
- name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Build APKs - name: Build APKs
run: make tailscale-debug.apk run: make tailscale-debug.apk
- name: Run tests - name: Run tests
run: make test run: make test

@ -299,7 +299,7 @@ docker-remove-shell-image: ## Removes all docker shell image
docker rmi --force tailscale-android-shell-amd64 docker rmi --force tailscale-android-shell-amd64
.PHONY: clean .PHONY: clean
clean: clean-tailscale.version ## Remove build artifacts. Does not purge docker build envs. Use dockerRemoveEnv for that. clean: ## Remove build artifacts. Does not purge docker build envs. Use dockerRemoveEnv for that.
@echo "Cleaning up old build artifacts" @echo "Cleaning up old build artifacts"
-rm -rf android/build $(DEBUG_APK) $(RELEASE_AAB) $(RELEASE_TV_AAB) $(LIBTAILSCALE) android/libs *.apk *.aab -rm -rf android/build $(DEBUG_APK) $(RELEASE_AAB) $(RELEASE_TV_AAB) $(LIBTAILSCALE) android/libs *.apk *.aab
@echo "Cleaning cached toolchain" @echo "Cleaning cached toolchain"

Loading…
Cancel
Save