From 058d1ae337cfc5a9da9072416e79a88c6492ffdf Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 5 Jun 2025 06:23:09 -0700 Subject: [PATCH] Remove clean and no-daemon We start from a clean slate on CI so running clean only adds time to the jobs. Also it is always recommended to use the daemon especially when running multiple jobs in order to speed up the build. --- .github/workflows/pre-merge.yaml | 4 ++-- Makefile | 12 ++---------- plugin-build/Makefile | 9 +++------ sentry-kotlin-compiler-plugin/Makefile | 9 +++------ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index 601fba7c1..3e90a52f7 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -45,7 +45,7 @@ jobs: if: always() - name: Build the Debug variant - run: ./gradlew assembleDebug --no-daemon + run: ./gradlew assembleDebug - name: Build the Release variant - run: ./gradlew assembleRelease --no-daemon + run: ./gradlew assembleRelease diff --git a/Makefile b/Makefile index b44941ed8..7c637dc0e 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,9 @@ -.PHONY: format clean preMerge stop all +.PHONY: format preMerge all format: ./gradlew spotlessApply -clean: - ./gradlew clean - preMerge: ./gradlew preMerge --continue -# We stop gradle at the end to make sure the cache folders -# don't contain any lock files and are free to be cached. -stop: - ./gradlew --stop - -all: stop clean format preMerge +all: format preMerge diff --git a/plugin-build/Makefile b/plugin-build/Makefile index 8976d5b66..8cc671a3f 100644 --- a/plugin-build/Makefile +++ b/plugin-build/Makefile @@ -1,13 +1,10 @@ -.PHONY: clean compile all dist - -clean: - ./gradlew clean +.PHONY: compile all dist compile: ./gradlew assemble # build distribution artifacts dist: - ./gradlew distZip --no-daemon --no-parallel + ./gradlew distZip --no-parallel -all: clean compile dist +all: compile dist diff --git a/sentry-kotlin-compiler-plugin/Makefile b/sentry-kotlin-compiler-plugin/Makefile index 8976d5b66..8cc671a3f 100644 --- a/sentry-kotlin-compiler-plugin/Makefile +++ b/sentry-kotlin-compiler-plugin/Makefile @@ -1,13 +1,10 @@ -.PHONY: clean compile all dist - -clean: - ./gradlew clean +.PHONY: compile all dist compile: ./gradlew assemble # build distribution artifacts dist: - ./gradlew distZip --no-daemon --no-parallel + ./gradlew distZip --no-parallel -all: clean compile dist +all: compile dist