From 89d82b6945dcd6ce4acfdd079df754b301feac60 Mon Sep 17 00:00:00 2001
From: "zuhao.peng" <zuhao.peng@aliyun.com>
Date: Thu, 18 Dec 2025 14:09:02 +0800
Subject: [PATCH] modified:   .github/workflows/dev.yaml

---
 .github/workflows/dev.yaml  |  7 +++----
 .github/workflows/prod.yaml | 10 ++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
index dd685de..c0175b3 100644
--- a/.github/workflows/dev.yaml
+++ b/.github/workflows/dev.yaml
@@ -28,13 +28,12 @@ permissions:
 jobs:
   docker-opts:
     if: |
-      github.event_name == 'workflow_dispatch' || 
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
+      github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.base.ref || github.ref }}
+        with
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Get tag
         shell: bash
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
index 9b3c652..3647eaf 100644
--- a/.github/workflows/prod.yaml
+++ b/.github/workflows/prod.yaml
@@ -9,11 +9,6 @@ on:
       - main
     types: [closed]
   workflow_dispatch:
-    inputs:
-      logLevel:
-        description: "Log level"
-        required: true
-        default: "debug"
 
 env:
   APP_NAME: assistant-us-prod
@@ -32,13 +27,12 @@ permissions:
 jobs:
   docker-opts:
     if: |
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
+      github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.base.ref || github.ref }}
+          ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Get tag
         shell: bash