Skip to content

Commit

Permalink
test matrix changes
Browse files Browse the repository at this point in the history
  • Loading branch information
aarzilli committed Jan 20, 2021
1 parent 0593a1c commit 9e358ef
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 20 deletions.
18 changes: 9 additions & 9 deletions .teamcity/settings.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
version = "2020.2"

val targets = arrayOf(
"linux/386/1.15.2",
"linux/386/1.16beta1",
"linux/386/latest",
"linux/amd64/1.15.3",
"linux/amd64/1.16beta1",
"linux/amd64/latest",
"windows/amd64/1.15.3",
"windows/amd64/1.16beta1",
"windows/amd64/latest"
"linux/amd64/1.13",
"linux/amd64/1.14",
"linux/amd64/1.15",
"linux/amd64/1.16",

"linux/386/1.15",

"windows/amd64/1.15",
"windows/amd64/1.16"
)

project {
Expand Down
12 changes: 5 additions & 7 deletions _scripts/test_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ set -e
set -x

apt-get -qq update
apt-get install -y dwz wget make git gcc curl
apt-get install -y dwz wget make git gcc curl jq
dwz --version

if [ "$1" = "golatest" ]; then
version=$(curl https://golang.org/VERSION?m=text)
else
version=$1
fi
version=$1
arch=$2

curl 'https://golang.org/dl/?mode=json&include=all' | jq '.[].version' --raw-output | egrep ^go$version'($|\.|beta|rc)' | head -1 | cut -c3-

echo "Go $version on $arch"

export GOROOT=/usr/local/go/"$version"
Expand All @@ -31,6 +30,5 @@ uname -a
echo "$PATH"
echo "$GOROOT"
echo "$GOPATH"

cd delve
make test
8 changes: 4 additions & 4 deletions _scripts/test_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ if (-Not(Test-Path "C:\procdump"))
}

# Install Go
if ($version -eq "golatest")
{
$version = Invoke-WebRequest -Uri https://golang.org/VERSION?m=text -UseBasicParsing | Select-Object -ExpandProperty Content
}
$version = Invoke-WebRequest -Uri 'https://golang.org/dl/?mode=json&include=all' -UseBasicParsing | foreach {$_.Content} | ConvertFrom-Json | foreach {$_.version} | Select-String -Pattern "^go$version($|\.|beta|rc)" | Select-Object -First 1 | foreach {$_.Line}
$version = $versoin.substring(2)

Write-Host "Go $version on $arch"
$env:GOROOT = "C:\go\$version"
if (-Not(Test-Path $env:GOROOT))
Expand All @@ -41,6 +40,7 @@ $env:PATH += ";C:\procdump;C:\mingw64\bin;$env:GOROOT\bin;$env:GOPATH\bin"
Write-Host $env:PATH
Write-Host $env:GOROOT
Write-Host $env:GOPATH

go version
go env
mingw32-make test

0 comments on commit 9e358ef

Please sign in to comment.