From 521aac0e4265e6baffa361bb61e49d1d5d9eae32 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sun, 6 Jun 2021 13:49:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=9D=9E=20Test-yml=20SSH=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflows/AutoBuild-d-team_newifi-d2.yml   | 14 ++------------
 .github/workflows/AutoBuild-x86_64.yml         | 18 ++++--------------
 .github/workflows/AutoBuild-xiaoyu_xy-c5.yml   | 16 +++-------------
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml
index e041d7b..7599073 100644
--- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml
+++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml
@@ -11,10 +11,6 @@ on:
   repository_dispatch:
   workflow_dispatch:
     inputs:
-      ssh:
-        description: 'SSH 连接到 Actions'
-        required: true
-        default: 'false'
       ip_addr:
         description: '固件 IP 地址 [可选]'
         default: ''
@@ -113,16 +109,10 @@ jobs:
         make defconfig > /dev/null 2>&1
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
-        Firmware-Diy_Base && Firmware-Diy
+        Firmware-Diy_Base
+        source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy
         rm -f .config && cp $GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET .config
 
-    - name: SSH Connection to Actions
-      uses: P3TERX/ssh2actions@v1.0.0
-      if: (github.event.inputs.SSH == 'true' && github.event.inputs.SSH  != 'false') || contains(github.event.action, 'SSH')
-      env:
-        TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
-        TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-
     - name: Compile
       run: |
         export Compile_Result=false
diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml
index e86ccc5..2f7cca5 100644
--- a/.github/workflows/AutoBuild-x86_64.yml
+++ b/.github/workflows/AutoBuild-x86_64.yml
@@ -11,10 +11,6 @@ on:
   repository_dispatch:
   workflow_dispatch:
     inputs:
-      ssh:
-        description: 'SSH 连接到 Actions'
-        required: true
-        default: 'false'
       ip_addr:
         description: '固件 IP 地址 [可选]'
         default: ''
@@ -49,7 +45,7 @@ env:
 ### END
 
 jobs:
-  build:
+  Compile:
     runs-on: ubuntu-latest
 
     steps:
@@ -113,16 +109,10 @@ jobs:
         make defconfig > /dev/null 2>&1
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
-        Firmware-Diy_Base && Firmware-Diy
+        Firmware-Diy_Base
+        source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy
         rm -f .config && cp $GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET .config
 
-    - name: SSH Connection to Actions
-      uses: P3TERX/ssh2actions@v1.0.0
-      if: (github.event.inputs.SSH == 'true' && github.event.inputs.SSH  != 'false') || contains(github.event.action, 'SSH')
-      env:
-        TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
-        TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-
     - name: Compile
       run: |
         export Compile_Result=false
@@ -170,4 +160,4 @@ jobs:
       if: env.DELETE_OLD_WORKFLOW == 'true' && !cancelled()
       with:
         retain_days: 1
-        keep_minimum_runs: 3
\ No newline at end of file
+        keep_minimum_runs: 3
diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml
index 5fb0095..fcead9c 100644
--- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml
+++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml
@@ -11,10 +11,6 @@ on:
   repository_dispatch:
   workflow_dispatch:
     inputs:
-      ssh:
-        description: 'SSH 连接到 Actions'
-        required: true
-        default: 'false'
       ip_addr:
         description: '固件 IP 地址 [可选]'
         default: ''
@@ -49,7 +45,7 @@ env:
 ### END
 
 jobs:
-  build:
+  Compile:
     runs-on: ubuntu-latest
 
     steps:
@@ -113,16 +109,10 @@ jobs:
         make defconfig > /dev/null 2>&1
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
         source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
-        Firmware-Diy_Base && Firmware-Diy
+        Firmware-Diy_Base
+        source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy
         rm -f .config && cp $GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET .config
 
-    - name: SSH Connection to Actions
-      uses: P3TERX/ssh2actions@v1.0.0
-      if: (github.event.inputs.SSH == 'true' && github.event.inputs.SSH  != 'false') || contains(github.event.action, 'SSH')
-      env:
-        TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
-        TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-
     - name: Compile
       run: |
         export Compile_Result=false