android: move test logs to main outputs

darakeon · Dec 3, 2023 · cd5f128 · cd5f128
1 parent 637517b
commit cd5f128
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -556,8 +556,8 @@ jobs:
           path: android
           command: gradle-with-metadata :Lib:testDebugUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/Lib/log
-          destination: log/lib
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml
@@ -580,8 +580,8 @@ jobs:
           path: android
           command: gradle-with-metadata :Lib:testReleaseUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/Lib/log
-          destination: log/lib
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml
@@ -604,8 +604,8 @@ jobs:
           path: android
           command: gradle-with-metadata :App:testDebugUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/App/log
-          destination: log/app
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml
@@ -628,8 +628,8 @@ jobs:
           path: android
           command: gradle-with-metadata :App:testReleaseUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/App/log
-          destination: log/app
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml

diff --git a/.circleci/pieces/20-test-android-lib-debug.yml b/.circleci/pieces/20-test-android-lib-debug.yml
@@ -14,8 +14,8 @@
           path: android
           command: gradle-with-metadata :Lib:testDebugUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/Lib/log
-          destination: log/lib
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml

diff --git a/.circleci/pieces/21-test-android-lib-release.yml b/.circleci/pieces/21-test-android-lib-release.yml
@@ -14,8 +14,8 @@
           path: android
           command: gradle-with-metadata :Lib:testReleaseUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/Lib/log
-          destination: log/lib
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml

diff --git a/.circleci/pieces/22-test-android-app-debug.yml b/.circleci/pieces/22-test-android-app-debug.yml
@@ -14,8 +14,8 @@
           path: android
           command: gradle-with-metadata :App:testDebugUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/App/log
-          destination: log/app
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml

diff --git a/.circleci/pieces/23-test-android-app-release.yml b/.circleci/pieces/23-test-android-app-release.yml
@@ -14,8 +14,8 @@
           path: android
           command: gradle-with-metadata :App:testReleaseUnitTest -x androidDependencies -x build -x packageRelease -x packageDebug
       - store_artifacts:
-          path: android/App/log
-          destination: log/app
+          path: outputs/logs/android
+          destination: logs
       - store_artifacts:
           path: android/gradle/verification-metadata.xml
           destination: verification-metadata.xml

diff --git a/android/Lib/src/main/kotlin/com/darakeon/dfm/lib/Log.kt b/android/Lib/src/main/kotlin/com/darakeon/dfm/lib/Log.kt
@@ -35,7 +35,7 @@ object Log {
 
 		var record = text.toString()
 
-		val path = Paths.get("log", "${BuildConfig.BUILD_TYPE}_${start}.log")
+		val path = Paths.get("..", "..", "outputs", "logs", "android", "${BuildConfig.BUILD_TYPE}_${start}.log")
 
 		if (Files.exists(path)) {
 			val bytes = Files.readAllBytes(path)
@@ -51,10 +51,6 @@ object Log {
 		@RequiresApi(Build.VERSION_CODES.O)
 		get() {
 			if (path == "") {
-				val dir = Paths.get("log")
-				if (!Files.exists(dir))
-					Files.createDirectory(dir)
-
 				path = now("yyyyMMdd_HHmmss_SSS")
 			}
 			return path

diff --git a/outputs/logs/android/.gitignore b/outputs/logs/android/.gitignore
@@ -0,0 +1 @@
+*.log