Skip to content

Commit

Permalink
Jenkinsfile updates
Browse files Browse the repository at this point in the history
Changes:

- Disable macOS by default. These workers don't have python3 so they cannot a portion of the tests.
- Add python38 to the PATH on Windows.
- Various fixes to the environment variables on Windows.
- Always add the GVM GOROOT/bin to the PATH on POSIX. Same as was being done on Windows.
- Use bat instead of sh on Windows to run `mage dumpVariables`.
  • Loading branch information
andrewkroh committed Mar 24, 2020
1 parent fd532e5 commit 5e74e88
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/install-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GVM_CMD="${HOME}/bin/gvm"

mkdir -p "${HOME}/bin"

curl -sSLo "${GVM_CMD}" "https://github.com/andrewkroh/gvm/releases/download/v0.2.1/gvm-${ARCH}-amd64"
curl -sSLo "${GVM_CMD}" "https://github.com/andrewkroh/gvm/releases/download/v0.2.2/gvm-${ARCH}-amd64"
chmod +x "${GVM_CMD}"

gvm ${GO_VERSION}|cut -d ' ' -f 2|tr -d '\"' > ${PROPERTIES_FILE}
Expand Down
13 changes: 12 additions & 1 deletion .ci/scripts/install-tools.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ IF ERRORLEVEL 1 (
mkdir %WORKSPACE%\bin
where /q gvm
IF ERRORLEVEL 1 (
curl -sL -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.2.1/gvm-windows-amd64.exe
curl -sL -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.2.2/gvm-windows-amd64.exe
)
FOR /f "tokens=*" %%i IN ('"gvm.exe" use %GO_VERSION% --format=batch') DO %%i

go env
go install -mod=vendor github.com/magefile/mage
mage -version
where mage

if not exist C:\Python38\python.exe (
REM Install python 3.8.
choco install python -y -r --no-progress --version 3.8.2
)
python --version
where python

4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ indent_style = tab
[*.mk]
indent_style = tab

[Jenkinsfile]
indent_size = 2
indent_style = space

[Vagrantfile]
indent_size = 2
indent_style = space
Expand Down
Loading

0 comments on commit 5e74e88

Please sign in to comment.