test yml 수정

peter-j0y · Aug 15, 2023 · 39c5ae7 · 39c5ae7
1 parent ff2fcd5
commit 39c5ae7
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 23 deletions.
diff --git a/.github/workflows/test_action.yml b/.github/workflows/test_action.yml
@@ -11,16 +11,26 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Get PR labels
+        id: pr-labels
+        uses: actions/labeler@v4
+
       - name: Execute action
         id: bump_version
         uses: ./ 
         with:
           version_file_path: "./version.gradle"
-          pr_labels: " dev  bump-patch "
+          pr_labels: ${{ steps.pr-labels.outputs.all-labels }}
           version_name_dev: "version_name_test_dev"
+          version_name_stg: "version_name_test_stg"
+          version_name_prod: "version_name_test_prod"
           version_code_dev: "version_code_test_dev"
+          version_code_stg: "version_code_test_stg"
+          version_code_prod: "version_code_test_prod"
 
       - name: Print current version & next version
         run: |
-          echo ${{ steps.bump_version.outputs.current_version }}
-          echo ${{ steps.bump_version.outputs.next_version }}
+          echo ${{ steps.bump_version.outputs.current_version_name }}
+          echo ${{ steps.bump_version.outputs.current_version_code }}
+          echo ${{ steps.bump_version.outputs.next_version_name }}
+          echo ${{ steps.bump_version.outputs.next_version_code }}
diff --git a/action.yml b/action.yml
@@ -28,12 +28,18 @@ inputs:
     description: 'version_code_prod_variable_name'
     required: false
 outputs:
-  current_version:
-    description: 'current version'
-    value: $CURRENT_VERSION
-  next_version:
-    description: 'next version'
-    value: $NEXT_VERSION
+  current_version_name:
+    description: 'current version name'
+    value: $CURRENT_VERSION_NAME
+  next_version_name:
+    description: 'next version name'
+    value: $NEXT_VERSION_NAME
+  current_version_code:
+    description: 'current version code'
+    value: $CURRENT_VERSION_CODE
+  next_version_code:
+    description: 'next version code'
+    value: $NEXT_VERSION_CODE
 runs:
   using: 'composite'
   steps:

diff --git a/src/control_multi_version.py b/src/control_multi_version.py
@@ -49,11 +49,12 @@ def write_gradle_version(vc_variable_name, vn_variable_name, new_version_code, n
     env_file = os.getenv('GITHUB_ENV')
     with open(env_file, 'a') as env_file:
         print(env_file)
-        env_file.write(f"NEXT_VERSION={new_version_name}\n")
+        env_file.write(f"NEXT_VERSION_NAME={new_version_name}\n")
+        env_file.write(f"NEXT_VERSION_CODE={new_version_code}\n")
 
 # label들을 해석하는 함수
 def decode_labels(labels):
-    label_list = labels.split(' ')
+    label_list = labels.split(',')
     print(label_list)
     if 'dev' in label_list and version_code_dev is not None and version_name_dev is not None:
         version_code = int(version_code_dev)
@@ -64,11 +65,11 @@ def decode_labels(labels):
         patch_version = int(version_name_dev
 .split('.')[2])
 
-        if 'bump-patch' in label_list:
+        if 'bump patch' in label_list:
             bump_patch(version_code_dev_variable_name, version_name_dev_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-minor' in label_list:
+        if 'bump minor' in label_list:
             bump_minor(version_code_dev_variable_name, version_name_dev_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-major' in label_list:
+        if 'bump major' in label_list:
             bump_major(version_code_dev_variable_name, version_name_dev_variable_name, version_code, major_version, minor_version, patch_version)
 
     if 'stg' in label_list and version_code_stg is not None and version_name_stg is not None:
@@ -77,11 +78,11 @@ def decode_labels(labels):
         minor_version = int(version_name_stg.split('.')[1])
         patch_version = int(version_name_stg.split('.')[2])
 
-        if 'bump-patch' in label_list:
+        if 'bump patch' in label_list:
             bump_patch(version_code_stg_variable_name, version_name_stg_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-minor' in label_list:
+        if 'bump minor' in label_list:
             bump_minor(version_code_stg_variable_name, version_name_stg_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-major' in label_list:
+        if 'bump major' in label_list:
             bump_major(version_code_stg_variable_name, version_name_stg_variable_name, version_code, major_version, minor_version, patch_version)
 
     if 'prod' in label_list and version_code_prod is not None and version_name_prod is not None:
@@ -90,19 +91,21 @@ def decode_labels(labels):
         minor_version = int(version_name_prod.split('.')[1])
         patch_version = int(version_name_prod.split('.')[2])
 
-        if 'bump-patch' in label_list:
+        if 'bump patch' in label_list:
             bump_patch(version_code_prod_variable_name, version_name_prod_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-minor' in label_list:
+        if 'bump minor' in label_list:
             bump_minor(version_code_prod_variable_name, version_name_prod_variable_name, version_code, major_version, minor_version, patch_version)
-        if 'bump-major' in label_list:
+        if 'bump major' in label_list:
             bump_major(version_code_prod_variable_name, version_name_prod_variable_name, version_code, major_version, minor_version, patch_version)
 
 # 버전 올리는 함수
 def bump_patch(vc_variable_name, vn_variable_name, version_code, major_version, minor_version, patch_version):
     print(f"Current version : {major_version}.{minor_version}.{patch_version}")
     env_file = os.getenv('GITHUB_ENV')
     with open(env_file, "a") as my_file:
-        my_file.write(f"CURRENT_VERSION={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_NAME={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_CODE={version_code}\n")
+
     patch_version += 1
     version_code += 1
     write_gradle_version(vc_variable_name, vn_variable_name, version_code, f"{major_version}.{minor_version}.{patch_version}")
@@ -111,7 +114,9 @@ def bump_minor(vc_variable_name, vn_variable_name, version_code, major_version,
     print(f"Current version : {major_version}.{minor_version}.{patch_version}")
     env_file = os.getenv('GITHUB_ENV')
     with open(env_file, "a") as my_file:
-        my_file.write(f"CURRENT_VERSION={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_NAME={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_CODE={version_code}\n")
+
     patch_version = 0
     minor_version += 1
     version_code += 1
@@ -121,7 +126,9 @@ def bump_major(vc_variable_name, vn_variable_name, version_code, major_version,
     print(f"Current version : {major_version}.{minor_version}.{patch_version}")
     env_file = os.getenv('GITHUB_ENV')
     with open(env_file, "a") as my_file:
-        my_file.write(f"CURRENT_VERSION={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_NAME={major_version}.{minor_version}.{patch_version}\n")
+        my_file.write(f"CURRENT_VERSION_CODE={version_code}\n")
+
     major_version += 1
     minor_version = 0
     patch_version = 0