Skip to content

Commit 07cf4bb

Browse files
authored
Revert Windows Install Action Fix (#2403)
Signed-off-by: Craig Perkins <[email protected]>
1 parent 9a307d0 commit 07cf4bb

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.github/workflows/plugin_install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
run: |
3535
cat > setup.sh <<'EOF'
3636
chmod +x ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh
37-
/bin/bash -c "./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh -y"
37+
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh"
3838
EOF
3939
4040
- name: Create Setup Script
4141
if: ${{ runner.os == 'Windows' }}
4242
run: |
4343
New-Item .\setup.bat -type file
44-
Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -y"
44+
Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -i -c -y"
4545
4646
- name: Run Opensearch with A Single Plugin
4747
uses: ./.github/actions/start-opensearch-with-one-plugin

tools/install_demo_configuration.bat

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ if %cluster_mode% == 0 (
6262
)
6363
)
6464

65-
if %assumeyes% == 1 (
66-
set "initsecurity=1"
67-
set "cluster_mode=1"
68-
)
69-
7065
set BASE_DIR=%SCRIPT_DIR%\..\..\..\
7166
if not exist %BASE_DIR% (
7267
echo "basedir does not exist"

tools/install_demo_configuration.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ if [ "$cluster_mode" == 0 ] && [ "$assumeyes" == 0 ]; then
9797
esac
9898
fi
9999

100-
if [ "$assumeyes" == 1 ]; then
101-
cluster_mode=1
102-
initsecurity=1
103-
fi
104-
105100
set -e
106101
BASE_DIR="$DIR/../../.."
107102
if [ -d "$BASE_DIR" ]; then

0 commit comments

Comments
 (0)