From 518d95664a15969fdd90a90015d1ec359d56a150 Mon Sep 17 00:00:00 2001 From: JimmyDaddy Date: Tue, 9 Jan 2024 23:36:50 +0800 Subject: [PATCH 1/2] ci: add concurrency configuration to CI workflow --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0c96cc..5bc9b3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: types: [opened, synchronize, reopened] workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true + jobs: install-dep: From c1275496a85e19264f5005afae40c04a6c0084a7 Mon Sep 17 00:00:00 2001 From: JimmyDaddy Date: Tue, 9 Jan 2024 23:37:50 +0800 Subject: [PATCH 2/2] fix: refactor image marker name generation --- .../main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.kt b/android/src/main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.kt index 22c1379..d68687d 100644 --- a/android/src/main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.kt +++ b/android/src/main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.kt @@ -284,7 +284,7 @@ class ImageMarkerManager(private val context: ReactApplicationContext) : ReactCo return if (null != filename) { if (filename.endsWith(".jpg") || filename.endsWith(".png")) "$cacheDir/$filename" else "$cacheDir/$filename$ext" } else { - val name = UUID.randomUUID().toString() + "image marker" + val name = UUID.randomUUID().toString() + "_image_marker" "$cacheDir/$name$ext" } }