Refactor GitHub Actions workflow to standardize SmartThings CLI command usage

- Removed workflow_dispatch input for branch type selection, simplifying the deployment process.
- Replaced all instances of npx commands with direct SmartThings CLI commands for consistency.
- Enhanced channel ID determination logic to handle automatic push events more effectively.
- Improved error handling and logging throughout the deployment steps for better visibility.

Author: lunDreame

.github/workflows/deploy.yml

@@ -5,16 +5,6 @@ on:
     branches:
       - main
       - test/**
-  workflow_dispatch:
-    inputs:
-      branch_type:
-        description: "Deploy to which environment"
-        required: true
-        type: choice
-        options:
-          - main
-          - test
-        default: "main"
 
 jobs:
   deploy:
@@ -33,7 +23,7 @@ jobs:
 
       - name: Install SmartThings CLI
         run: |
-          npm install -g @smartthings/cli@latest
+          npm install --global @smartthings/cli@latest
 
       - name: Setup dependencies
         run: |
@@ -77,27 +67,27 @@ jobs:
               PROFILE_NAME=$(basename "$file" .yml)
               echo "Processing profile: $PROFILE_NAME"
 
-              PROFILE_ID=$(npx -y @smartthings/cli deviceprofiles --json 2>/dev/null | jq -r '.[] | select(.name=="'"$PROFILE_NAME"'") | .id' 2>/dev/null || echo "")
+              PROFILE_ID=$(smartthings deviceprofiles --json 2>/dev/null | jq -r '.[] | select(.name=="'"$PROFILE_NAME"'") | .id' 2>/dev/null || echo "")
 
               if [[ -n "$PROFILE_ID" && "$PROFILE_ID" != "null" ]]; then
                 echo "Deleting existing profile: $PROFILE_NAME ($PROFILE_ID)"
-                npx -y @smartthings/cli deviceprofiles:delete "$PROFILE_ID" >/dev/null 2>&1 || true
+                smartthings deviceprofiles:delete "$PROFILE_ID" >/dev/null 2>&1 || true
               fi
 
               echo "Creating profile from file: $file"
-              if ! npx -y @smartthings/cli deviceprofiles:create --input "$file" 2>&1; then
+              if ! smartthings deviceprofiles:create --input "$file" 2>&1; then
                 echo "ERROR: Failed to create profile $PROFILE_NAME"
                 continue
               fi
 
-              NEW_ID=$(npx -y @smartthings/cli deviceprofiles --json 2>/dev/null | jq -r '.[] | select(.name=="'"$PROFILE_NAME"'") | .id' 2>/dev/null || echo "")
+              NEW_ID=$(smartthings deviceprofiles --json 2>/dev/null | jq -r '.[] | select(.name=="'"$PROFILE_NAME"'") | .id' 2>/dev/null || echo "")
               if [[ -z "$NEW_ID" || "$NEW_ID" == "null" ]]; then
                 echo "ERROR: Failed to find created profile $PROFILE_NAME"
                 continue
               fi
 
               echo "Publishing profile: $PROFILE_NAME ($NEW_ID)"
-              if ! npx -y @smartthings/cli deviceprofiles:publish "$NEW_ID" 2>&1; then
+              if ! smartthings deviceprofiles:publish "$NEW_ID" 2>&1; then
                 echo "ERROR: Failed to publish profile $PROFILE_NAME"
                 continue
               fi
@@ -107,52 +97,27 @@ jobs:
       - name: Determine channel ID
         id: channel
         run: |
-          # workflow_dispatch로 수동 실행된 경우 입력값 사용, push 이벤트인 경우 브랜치 이름 사용
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            BRANCH_TYPE="${{ github.event.inputs.branch_type }}"
-            echo "Manual workflow dispatch with branch_type: $BRANCH_TYPE"
-
-            if [[ "$BRANCH_TYPE" == "main" ]]; then
-              CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_MAIN }}"
-              if [[ -z "$CHANNEL_ID" ]]; then
-                echo "ERROR: SMARTTHINGS_CHANNEL_ID_MAIN secret is not set"
-                exit 1
-              fi
-              echo "Using main channel: $CHANNEL_ID"
-            elif [[ "$BRANCH_TYPE" == "test" ]]; then
-              CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_TEST }}"
-              if [[ -z "$CHANNEL_ID" ]]; then
-                echo "ERROR: SMARTTHINGS_CHANNEL_ID_TEST secret is not set"
-                exit 1
-              fi
-              echo "Using test channel: $CHANNEL_ID"
-            else
-              echo "ERROR: Unknown branch_type: $BRANCH_TYPE"
+          BRANCH_NAME="${{ github.ref_name }}"
+          echo "Automatic push event on branch: $BRANCH_NAME"
+
+          if [[ "$BRANCH_NAME" == "main" ]]; then
+            CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_MAIN }}"
+            if [[ -z "$CHANNEL_ID" ]]; then
+              echo "ERROR: SMARTTHINGS_CHANNEL_ID_MAIN secret is not set"
               exit 1
             fi
-          else
-            BRANCH_NAME="${{ github.ref_name }}"
-            echo "Automatic push event on branch: $BRANCH_NAME"
-
-            if [[ "$BRANCH_NAME" == "main" ]]; then
-              CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_MAIN }}"
-              if [[ -z "$CHANNEL_ID" ]]; then
-                echo "ERROR: SMARTTHINGS_CHANNEL_ID_MAIN secret is not set"
-                exit 1
-              fi
-              echo "Using main channel: $CHANNEL_ID"
-            elif [[ "$BRANCH_NAME" =~ ^test/ ]]; then
-              CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_TEST }}"
-              if [[ -z "$CHANNEL_ID" ]]; then
-                echo "ERROR: SMARTTHINGS_CHANNEL_ID_TEST secret is not set"
-                exit 1
-              fi
-              echo "Using test channel: $CHANNEL_ID"
-            else
-              echo "ERROR: Unknown branch pattern: $BRANCH_NAME"
-              echo "Expected branch: main or test/*"
+            echo "Using main channel: $CHANNEL_ID"
+          elif [[ "$BRANCH_NAME" =~ ^test/ ]]; then
+            CHANNEL_ID="${{ secrets.SMARTTHINGS_CHANNEL_ID_TEST }}"
+            if [[ -z "$CHANNEL_ID" ]]; then
+              echo "ERROR: SMARTTHINGS_CHANNEL_ID_TEST secret is not set"
               exit 1
             fi
+            echo "Using test channel: $CHANNEL_ID"
+          else
+            echo "ERROR: Unknown branch pattern: $BRANCH_NAME"
+            echo "Expected branch: main or test/*"
+            exit 1
           fi
 
           echo "channel_id=$CHANNEL_ID" >> $GITHUB_OUTPUT
@@ -169,7 +134,7 @@ jobs:
 
             # Package driver
             echo "Packaging driver in $folder..."
-            if ! npx -y @smartthings/cli edge:drivers:package "$folder" 2>&1; then
+            if ! smartthings edge:drivers:package "$folder" 2>&1; then
               echo "ERROR: Failed to package driver $folder"
               continue
             fi
@@ -181,7 +146,7 @@ jobs:
             echo "Looking for driver with packageKey: $PACKAGE_KEY or name: $DRIVER_NAME"
 
             # Find driver ID by packageKey or name
-            DRIVER_ID=$(npx -y @smartthings/cli edge:drivers --json 2>/dev/null | jq -r --arg pk "$PACKAGE_KEY" --arg name "$DRIVER_NAME" '.[] | select(.packageKey == $pk or .name == $name) | .driverId' 2>/dev/null | head -n1)
+            DRIVER_ID=$(smartthings edge:drivers --json 2>/dev/null | jq -r --arg pk "$PACKAGE_KEY" --arg name "$DRIVER_NAME" '.[] | select(.packageKey == $pk or .name == $name) | .driverId' 2>/dev/null | head -n1)
 
             if [[ -z "$DRIVER_ID" || "$DRIVER_ID" == "null" ]]; then
               echo "WARNING: Driver not found in existing drivers list"
@@ -194,7 +159,7 @@ jobs:
 
             # Assign driver to channel
             echo "Assigning driver $DRIVER_ID to channel $CHANNEL_ID..."
-            if ! npx -y @smartthings/cli edge:channels:assign --channel "$CHANNEL_ID" "$DRIVER_ID" 2>&1; then
+            if ! smartthings edge:channels:assign --channel "$CHANNEL_ID" "$DRIVER_ID" 2>&1; then
               echo "ERROR: Failed to assign driver $DRIVER_ID to channel $CHANNEL_ID"
               continue
             fi