Skip to content

Commit e89c259

Browse files
committed
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 <[email protected]>
1 parent c1ef8b5 commit e89c259

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.github/workflows/android.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77
pull_request:
88
branches:
9-
- '*'
9+
- "*"
1010

1111
jobs:
1212
build:
@@ -15,20 +15,23 @@ jobs:
1515
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1616

1717
steps:
18+
- name: Check out code
19+
uses: actions/checkout@v3
20+
- uses: actions/setup-go@v5
21+
with:
22+
go-version-file: "go.mod"
23+
- name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest
24+
uses: actions/setup-java@v3
25+
with:
26+
distribution: "temurin"
27+
java-version: "17"
1828

19-
- name: Check out code
20-
uses: actions/checkout@v3
21-
- uses: actions/setup-go@v5
22-
with:
23-
go-version-file: 'go.mod'
24-
- name: Switch to Java 17 # Note: 17 is pre-installed on ubuntu-latest
25-
uses: actions/setup-java@v3
26-
with:
27-
distribution: 'temurin'
28-
java-version: '17'
29+
# Clean should essentially be a no-op, but make sure that it works.
30+
- name: Clean
31+
run: make clean
2932

30-
- name: Build APKs
31-
run: make tailscale-debug.apk
33+
- name: Build APKs
34+
run: make tailscale-debug.apk
3235

33-
- name: Run tests
34-
run: make test
36+
- name: Run tests
37+
run: make test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ docker-remove-shell-image: ## Removes all docker shell image
299299
docker rmi --force tailscale-android-shell-amd64
300300

301301
.PHONY: clean
302-
clean: clean-tailscale.version ## Remove build artifacts. Does not purge docker build envs. Use dockerRemoveEnv for that.
302+
clean: ## Remove build artifacts. Does not purge docker build envs. Use dockerRemoveEnv for that.
303303
@echo "Cleaning up old build artifacts"
304304
-rm -rf android/build $(DEBUG_APK) $(RELEASE_AAB) $(RELEASE_TV_AAB) $(LIBTAILSCALE) android/libs *.apk *.aab
305305
@echo "Cleaning cached toolchain"

0 commit comments

Comments
 (0)