Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Windows Install Action Fix" #2401

Merged
merged 11 commits into from
Jan 13, 2023
Merged

Revert "Windows Install Action Fix" #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0f865a3
Revert change in install_demo_configuration to default cluster mode t…
cwperks Jan 13, 2023
01a2e43
echo y three times
cwperks Jan 13, 2023
2568bdb
Multiple ampersands
cwperks Jan 13, 2023
13f269a
Use array syntax
cwperks Jan 13, 2023
55ffcd3
Multiple ampersands
cwperks Jan 13, 2023
1be55a1
Try powershell -c
cwperks Jan 13, 2023
0da5bfb
echo three times
cwperks Jan 13, 2023
1cff6aa
Use double ampersand
cwperks Jan 13, 2023
7d70318
Try single 'y'
cwperks Jan 13, 2023
0f8c215
Use -i -c
cwperks Jan 13, 2023
a0a34e4
Add -y as well
cwperks Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/plugin_install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
run: |
cat > setup.sh <<'EOF'
chmod +x ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh
/bin/bash -c "./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh -y"
/bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh"
EOF
- name: Create Setup Script
if: ${{ runner.os == 'Windows' }}
run: |
New-Item .\setup.bat -type file
Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -y"
Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -i -c -y"
Get-Content .\setup.bat
- name: Run Opensearch with A Single Plugin
Expand Down
5 changes: 0 additions & 5 deletions tools/install_demo_configuration.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ if %cluster_mode% == 0 (
)
)

if %assumeyes% == 1 (
set "initsecurity=1"
set "cluster_mode=1"
)

set BASE_DIR=%SCRIPT_DIR%\..\..\..\
if not exist %BASE_DIR% (
echo "basedir does not exist"
Expand Down
5 changes: 0 additions & 5 deletions tools/install_demo_configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ if [ "$cluster_mode" == 0 ] && [ "$assumeyes" == 0 ]; then
esac
fi

if [ "$assumeyes" == 1 ]; then
cluster_mode=1
initsecurity=1
fi

set -e
BASE_DIR="$DIR/../../.."
if [ -d "$BASE_DIR" ]; then
Expand Down