Merge branch 'develop' into production

EAT-SSU · Oct 10, 2024 · adc119a · adc119a
2 parents 75af5f9 + d942866
commit adc119a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
@@ -1,21 +1,24 @@
 name: Release Tag
 
 #트리거 요소
+
 on: 
   pull_request:
     branches:
       - production
     types:
       - closed
-
+    paths:
+      - 'release/**'
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: 버전 정보 추출
-      run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
-      id: extract_version_name       
+      run: echo "##[set-output name=version;]$(echo '${{ github.ref }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+      id: extract_version_name
     - name: Release 생성 
       uses: actions/create-release@v1
       env: 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,7 +23,7 @@ android {
         targetSdk = 34
         versionCode = 21
         versionName = "2.1.1"
-        
+
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/com/eatssu/android/di/AppModule.kt b/app/src/main/java/com/eatssu/android/di/AppModule.kt
@@ -32,5 +32,4 @@ object AppModule {
     fun provideFirebaseRemoteConfigRepository(): FirebaseRemoteConfigRepository {
         return FirebaseRemoteConfigRepository()
     }
-
 }
diff --git a/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt b/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt
@@ -24,7 +24,6 @@ class InfoViewModel @Inject constructor(
     private val restaurantInfoMap: MutableMap<Restaurant, RestaurantInfo> = mutableMapOf()
 
     init {
-
         // Load cafeteria info from repository and update the StateFlow
         _infoList.value = firebaseRemoteConfigRepository.getCafeteriaInfo()
         Log.d("InfoViewModel", _infoList.value.toString())