PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

goversion,teamcity: update test matrix and fix build scripts (#3463)

Browse Source 
Update test matrix to remove 1.18 and add 1.21, fix build scripts to
deal with the new format returned by:
	https://golang.org/VERSION?m=text
which now has an extra second line with the time.
This commit is contained in:
Alessandro Arzilli 2023-08-11 17:52:35 +02:00 committed by GitHub
parent e49c81cc5d
commit 891a1f080d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.teamcity/settings.kts vendored
View File

@ -35,29 +35,29 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
version = "2020.2" version = "2020.2"
val targets = arrayOf( val targets = arrayOf(
"linux/amd64/1.18",
"linux/amd64/1.19", "linux/amd64/1.19",
"linux/amd64/1.20", "linux/amd64/1.20",
"linux/amd64/1.21",
"linux/amd64/tip", "linux/amd64/tip",
"linux/386/1.20", "linux/386/1.21",
"linux/arm64/1.20", "linux/arm64/1.21",
"linux/arm64/tip", "linux/arm64/tip",
"linux/ppc64le/1.20", "linux/ppc64le/1.21",
"linux/ppc64le/tip", "linux/ppc64le/tip",
"windows/amd64/1.20", "windows/amd64/1.21",
"windows/amd64/tip", "windows/amd64/tip",
"windows/arm64/1.20", "windows/arm64/1.21",
"windows/arm64/tip", "windows/arm64/tip",
"mac/amd64/1.20", "mac/amd64/1.21",
"mac/amd64/tip", "mac/amd64/tip",
"mac/arm64/1.20", "mac/arm64/1.21",
"mac/arm64/tip" "mac/arm64/tip"
) )

2
_scripts/test_linux.sh
View File

@ -22,7 +22,7 @@ function getgo {
if [ "$version" = "gotip" ]; then if [ "$version" = "gotip" ]; then
echo Building Go from tip echo Building Go from tip
getgo $(curl https://go.dev/VERSION?m=text) getgo $(curl https://go.dev/VERSION?m=text | head -1)
export GOROOT_BOOTSTRAP=$GOROOT export GOROOT_BOOTSTRAP=$GOROOT
export GOROOT=/usr/local/go/go-tip export GOROOT=/usr/local/go/go-tip
git clone https://go.googlesource.com/go /usr/local/go/go-tip git clone https://go.googlesource.com/go /usr/local/go/go-tip

2
_scripts/test_mac.sh
View File

@ -8,7 +8,7 @@ ARCH=$2
TMPDIR=$3 TMPDIR=$3
if [ "$GOVERSION" = "gotip" ]; then if [ "$GOVERSION" = "gotip" ]; then
bootstrapver=$(curl https://go.dev/VERSION?m=text) bootstrapver=$(curl https://go.dev/VERSION?m=text | head -1)
cd $TMPDIR cd $TMPDIR
curl -sSL "https://storage.googleapis.com/golang/$bootstrapver.darwin-$ARCH.tar.gz" | tar -xz curl -sSL "https://storage.googleapis.com/golang/$bootstrapver.darwin-$ARCH.tar.gz" | tar -xz
cd - cd -

2
_scripts/test_windows.ps1
View File

@ -57,7 +57,7 @@ function GetGo($version) {
if ($version -eq "gotip") { if ($version -eq "gotip") {
#Exit 0 #Exit 0
$latest = Invoke-WebRequest -Uri "https://golang.org/VERSION?m=text" -UseBasicParsing | Select-Object -ExpandProperty Content -ErrorAction Stop $latest = (Invoke-WebRequest -Uri "https://golang.org/VERSION?m=text" -UseBasicParsing | Select-Object -ExpandProperty Content -ErrorAction Stop).Split([Environment]::NewLine) | select -first 1
GetGo $latest GetGo $latest
$env:GOROOT_BOOTSTRAP = $env:GOROOT $env:GOROOT_BOOTSTRAP = $env:GOROOT
$env:GOROOT = "$binDir\go\go-tip" $env:GOROOT = "$binDir\go\go-tip"

2
pkg/goversion/compat.go
View File

@ -8,7 +8,7 @@ import (
var ( var (
MinSupportedVersionOfGoMajor = 1 MinSupportedVersionOfGoMajor = 1
MinSupportedVersionOfGoMinor = 18 MinSupportedVersionOfGoMinor = 19
MaxSupportedVersionOfGoMajor = 1 MaxSupportedVersionOfGoMajor = 1
MaxSupportedVersionOfGoMinor = 21 MaxSupportedVersionOfGoMinor = 21
goTooOldErr = fmt.Sprintf("Go version %%s is too old for this version of Delve (minimum supported version %d.%d, suppress this error with --check-go-version=false)", MinSupportedVersionOfGoMajor, MinSupportedVersionOfGoMinor) goTooOldErr = fmt.Sprintf("Go version %%s is too old for this version of Delve (minimum supported version %d.%d, suppress this error with --check-go-version=false)", MinSupportedVersionOfGoMajor, MinSupportedVersionOfGoMinor)