percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-02-02 02:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #826 from percona/fix_build

Browse Source 
Fix build
This commit is contained in:
Sveta Smirnova
2024-06-07 22:12:16 +03:00
parent 143f694a78 efbebc6f71
commit 942298a246
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/scripts/pt_builder.sh
View File

@@ -155,11 +155,11 @@ get_system(){
}
install_go() {
wget --no-check-certificate http://jenkins.percona.com/downloads/golang/go1.9.4.linux-amd64.tar.gz -O /tmp/golang1.9.4.tar.gz
tar --transform=s,go,go1.9, -zxf /tmp/golang1.9.4.tar.gz
rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
mv go1.9 /usr/local/
ln -s /usr/local/go1.9 /usr/local/go
#wget --no-check-certificate http://jenkins.percona.com/downloads/golang/go1.9.4.linux-amd64.tar.gz -O /tmp/golang1.9.4.tar.gz
#tar --transform=s,go,go1.9, -zxf /tmp/golang1.9.4.tar.gz
#rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
#mv go1.9 /usr/local/
#ln -s /usr/local/go1.9 /usr/local/go
GO_VERSION=1.21.5
wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz
tar -C /usr/local -xzf /tmp/golang.tar.gz

2
t/lib/bash/collect.sh
View File

@@ -77,8 +77,6 @@ cmd_ok \
if [ "$(which lsof 2>/dev/null)" ]; then
wait_for_files "$p-lsof"
echo "$p-lsof"
ls "$p-lsof"
cmd_ok \
"grep -q 'COMMAND[ ]\+PID[ ]\+USER' $p-lsof" \
"lsof"