Merge pull request #16 from srz-zumix/feature/reduce_restart

reduce restart
srz-zumix · May 18, 2022 · d0087e0 · d0087e0
2 parents be584b3 + aed9060
commit d0087e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/action.yml b/action.yml
@@ -69,6 +69,16 @@ runs:
       run: |
         "${GITHUB_ACTION_PATH}/install-plugins.sh" "${{ inputs.plugins_file }}"
       if: "inputs.plugins_file != ''"
+    - name: Restart Jenkins
+      shell: bash
+      env:
+        JENKINS_SERVICE_ID: ${{ inputs.id }}
+      run: |
+        "${GITHUB_ACTION_PATH}/restart-and-wait.sh"
+      if: >
+        inputs.plugins_file != '' &&
+        inputs.plugins != '' && 
+        inputs.install_suggested_plugins == 'true'
     - name: Setup JCasC
       shell: bash
       if: "inputs.jcasc_path != ''"

diff --git a/install-plugins-fromenv.sh b/install-plugins-fromenv.sh
@@ -4,7 +4,4 @@ if [ -n "${INSTALL_PLUGINS}" ]; then
     echo '::group::jenkins plugin install'
     echo "${INSTALL_PLUGINS}" | xargs -I{} jenkins-cli install-plugin {}
     echo '::endgroup::'
-
-    # restart
-    "${GITHUB_ACTION_PATH}/restart-and-wait.sh"
 fi
diff --git a/install-plugins.sh b/install-plugins.sh
@@ -6,7 +6,4 @@ if [ -f "${PLUGIN_FILES}" ]; then
     echo '::group::jenkins plugin install'
     xargs -I{} jenkins-cli install-plugin {} < "${PLUGIN_FILES}"
     echo '::endgroup::'
-
-    # restart
-    "${GITHUB_ACTION_PATH}/restart-and-wait.sh"
 fi