Skip to content

Commit c2ac2ba

Browse files
Release 1.0.90
1 parent db62dbf commit c2ac2ba

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

Jenkinsfile-windows

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,24 @@ pipeline {
4747
echo "The workspace is ${env.WORKSPACE}"
4848
script {
4949
echo 'Stage Build, Test, Deploy'
50-
def status = powershell(returnStatus: true, script: 'ipconfig')
50+
def status = powershell(returnStatus: true, script: "cd")
51+
status = powershell(returnStatus: true, script: "(new-object net.webclient).DownloadFile('https://raw.githubusercontent.com/PredixDev/local-setup/master/setup-windows.bat','setup-windows.bat')")
5152
if (status == 0) {
52-
echo "powershell success"
53+
echo "powershell1 success"
54+
bat "echo %cd%"
55+
bat "dir"
56+
status = powershell(returnStatus: true, script: "${workspace}\\setup-windows.bat")
57+
if (status == 0) {
58+
echo "powershell2 success"
59+
}
60+
else {
61+
echo "powershell2 failed"
62+
error("powershell2 failed")
63+
}
5364
}
5465
else {
55-
echo "powershell failed"
66+
echo "powershell1 failed"
67+
error("powershell1 failed")
5668
}
5769
}
5870
}

setup-windows.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ GOTO :eof
107107

108108
:CHECK_FAIL
109109
IF NOT !errorlevel! EQU 0 (
110-
ECHO FAILED
110+
ECHO FAILED !errorlevel!
111111
ECHO Any changes to the PATH will not take affect unless you reopen a new Admin command window, please open a new window now.
112112
exit /b !errorlevel!
113113
)
@@ -225,6 +225,7 @@ GOTO :eof
225225
CALL :CHOCO_INSTALL ant
226226
CALL :CHOCO_INSTALL gradle
227227

228+
CALL :CHOCO_INSTALL android-sdk -y
228229
CALL :CHOCO_INSTALL androidstudio -y
229230
CALL :CHOCO_INSTALL adb
230231
ECHO Installing Android Studio complete...

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "local setup",
3-
"version": "1.0.89",
3+
"version": "1.0.90",
44
"private": true,
55
"dependencies": {},
66
"author": "rishabhtulsian"

0 commit comments

Comments
 (0)