Skip to content
This repository was archived by the owner on Oct 29, 2023. It is now read-only.

Commit 59e4a4c

Browse files
datacharmerdatacharmer
committed
Merge branch 'master' of ssh+git://datacharmer.github.com/datacharmer/dbdeployer
2 parents 489d972 + 77d20cb commit 59e4a4c

File tree

7 files changed

+125
-49
lines changed

7 files changed

+125
-49
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 1.73.0 09-Jul-2023
2+
3+
## NEW FEATURES
4+
5+
* Add tarballs for MySQL 8.0.33 to downloads list
6+
7+
## ADJUSTMENTS
8+
* Fix security vulnerabilities in dependency (golang.org/x/text and golang.org/x/term)
9+
10+
## 1.72.1 24-Feb-2023
11+
12+
## ADJUSTMENTS
13+
* Fix security vulnerability in dependency (golang.org/x/text)
14+
115
## 1.72.0 22-Jan-2023
216

317
## ADJUSTMENTS

‎common/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.72.0
1+
1.73.0

‎downloads/tarball_list.json

Lines changed: 90 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,32 +1996,32 @@
19961996
"date_added": "2023-01-21 22:42"
19971997
},
19981998
{
1999-
"name": "mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
2000-
"checksum": "MD5:377b6ae9c88a698438a19d67efa03252",
2001-
"OS": "Linux",
2002-
"arch": "amd64",
2003-
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
2004-
"flavor": "mysql",
2005-
"minimal": true,
2006-
"size": 60181648,
1999+
"name": "mysql-shell-8.0.33-macos13-arm64.tar.gz",
2000+
"checksum": "MD5:f17c3c80dfbf4d319fd39b3f7f81df8c",
2001+
"OS": "Darwin",
2002+
"arch": "arm64",
2003+
"url": "https://dev.mysql.com/get/Downloads/MySQL-Shell-8.0/mysql-shell-8.0.33-macos13-arm64.tar.gz",
2004+
"flavor": "shell",
2005+
"minimal": false,
2006+
"size": 62328435,
20072007
"short_version": "8.0",
20082008
"version": "8.0.33",
2009-
"notes": "added with version 1.72.0",
2010-
"date_added": "2023-06-28 15:55"
2009+
"notes": "added with version 1.72.1",
2010+
"date_added": "2023-04-18 16:13"
20112011
},
20122012
{
2013-
"name": "mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
2014-
"checksum": "MD5:f5e01242975453ec6db02727848975c9",
2015-
"OS": "Linux",
2016-
"arch": "aarch64",
2017-
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
2018-
"flavor": "mysql",
2019-
"minimal": true,
2020-
"size": 58393312,
2013+
"name": "mysql-shell-8.0.33-macos13-x86-64bit.tar.gz",
2014+
"checksum": "MD5:828b9840a0f360232c32ca3f337dfff3",
2015+
"OS": "Darwin",
2016+
"arch": "x86-64",
2017+
"url": "https://dev.mysql.com/get/Downloads/MySQL-Shell-8.0/mysql-shell-8.0.33-macos13-x86-64bit.tar.gz",
2018+
"flavor": "shell",
2019+
"minimal": false,
2020+
"size": 65492759,
20212021
"short_version": "8.0",
20222022
"version": "8.0.33",
2023-
"notes": "added with version 1.72.0",
2024-
"date_added": "2023-06-28 15:55"
2023+
"notes": "added with version 1.72.1",
2024+
"date_added": "2023-04-18 16:13"
20252025
},
20262026
{
20272027
"name": "mysql-shell-8.0.33-linux-glibc2.12-x86-64bit.tar.gz",
@@ -2037,20 +2037,6 @@
20372037
"notes": "added with version 1.72.0",
20382038
"date_added": "2023-06-28 17:43"
20392039
},
2040-
{
2041-
"name": "mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
2042-
"checksum": "MD5:d6bdc9974ca65e3b5be8224b2c834d4f",
2043-
"OS": "Linux",
2044-
"arch": "amd64",
2045-
"url": "https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
2046-
"flavor": "ndb",
2047-
"minimal": false,
2048-
"size": 687641668,
2049-
"short_version": "8.0",
2050-
"version": "8.0.33",
2051-
"notes": "added with version 1.72.0",
2052-
"date_added": "2023-06-28 17:43"
2053-
},
20542040
{
20552041
"name": "mysql-8.0.33-macos13-arm64.tar.gz",
20562042
"checksum": "MD5:3e1698ba3cd1283ede4426f062357e1f",
@@ -2106,6 +2092,76 @@
21062092
"version": "8.0.33",
21072093
"notes": "added with version 1.72.0",
21082094
"date_added": "2023-06-28 17:45"
2095+
},
2096+
{
2097+
"name": "mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
2098+
"checksum": "MD5:d6bdc9974ca65e3b5be8224b2c834d4f",
2099+
"OS": "Linux",
2100+
"arch": "amd64",
2101+
"url": "https://dev.mysql.com/get/Downloads/MySQL-Cluster-8.0/mysql-cluster-8.0.33-linux-glibc2.12-x86_64.tar.xz",
2102+
"flavor": "ndb",
2103+
"minimal": false,
2104+
"size": 687641668,
2105+
"short_version": "8.0",
2106+
"version": "8.0.33",
2107+
"notes": "added with version 1.73.0",
2108+
"date_added": "2023-07-09 18:56"
2109+
},
2110+
{
2111+
"name": "mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
2112+
"checksum": "MD5:377b6ae9c88a698438a19d67efa03252",
2113+
"OS": "Linux",
2114+
"arch": "amd64",
2115+
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-x86_64-minimal.tar.xz",
2116+
"flavor": "mysql",
2117+
"minimal": true,
2118+
"size": 60181648,
2119+
"short_version": "8.0",
2120+
"version": "8.0.33",
2121+
"notes": "added with version 1.73.0",
2122+
"date_added": "2023-07-09 18:56"
2123+
},
2124+
{
2125+
"name": "mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
2126+
"checksum": "MD5:f5e01242975453ec6db02727848975c9",
2127+
"OS": "Linux",
2128+
"arch": "aarch64",
2129+
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.17-aarch64-minimal.tar.xz",
2130+
"flavor": "mysql",
2131+
"minimal": true,
2132+
"size": 58393312,
2133+
"short_version": "8.0",
2134+
"version": "8.0.33",
2135+
"notes": "added with version 1.73.0",
2136+
"date_added": "2023-07-09 18:56"
2137+
},
2138+
{
2139+
"name": "mysql-8.0.33-linux-glibc2.17-aarch64.tar.gz",
2140+
"checksum": "SHA512:43b8f88ee4b7a0fb51bd51ee7ee6d3622895cb67b9c5200c2446a2b4646976dae0c900f6772d659355b3f120462c7c8d76af797ec752f759ec4b43fe17efe2ca",
2141+
"OS": "Linux",
2142+
"arch": "aarch64",
2143+
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.28-aarch64.tar.gz",
2144+
"flavor": "mysql",
2145+
"minimal": false,
2146+
"size": 522168599,
2147+
"short_version": "8.0",
2148+
"version": "8.0.33",
2149+
"notes": "added with version 1.73.0",
2150+
"date_added": "2023-07-09 18:59"
2151+
},
2152+
{
2153+
"name": "mysql-8.0.33-linux-glibc2.28-x86_64.tar.gz",
2154+
"checksum": "SHA512:31d58559dc6ba8de0fa3186ff484c081f52d44b8b2d753ef6dcd76f1b14156958dc46e4776d198a084402aaf45770a61541a576f3c487912176043baaaacfee8",
2155+
"OS": "Linux",
2156+
"arch": "amd64",
2157+
"url": "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.33-linux-glibc2.28-x86_64.tar.gz",
2158+
"flavor": "mysql",
2159+
"minimal": false,
2160+
"size": 539869923,
2161+
"short_version": "8.0",
2162+
"version": "8.0.33",
2163+
"notes": "added with version 1.73.0",
2164+
"date_added": "2023-07-09 19:00"
21092165
}
21102166
]
21112167
}

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/stretchr/testify v1.8.0
1616
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
1717
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
18-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
19-
golang.org/x/text v0.3.8
18+
golang.org/x/term v0.5.0
19+
golang.org/x/text v0.7.0
2020
jaytaylor.com/html2text v0.0.0-20200412013138-3577fbdbcff7
2121

2222
)
@@ -33,7 +33,7 @@ require (
3333
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3434
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
3535
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
36-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
36+
golang.org/x/sys v0.5.0 // indirect
3737
google.golang.org/appengine v1.6.7 // indirect
3838
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
3939
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,14 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
5959
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
6060
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
6161
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
62-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
63-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
64-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
65-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
66-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
62+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
63+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
64+
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
65+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
6766
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6867
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
69-
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
70-
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
68+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
69+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
7170
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7271
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
7372
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=

‎scripts/ci.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ function run {
2424
fi
2525
}
2626

27+
cat /etc/*release
28+
pwd
29+
set
30+
2731
export dbdeployer_version=$(cat common/VERSION)
2832
export RUN_CONCURRENTLY=1
2933
export EXIT_ON_FAILURE=1
@@ -40,7 +44,7 @@ fi
4044
cp $executable dbdeployer
4145
export PATH=$PWD:$PATH
4246

43-
run ./test/run-mock-tests.sh
44-
run ./test/docker-test.sh $dbdeployer_version
45-
run ./test/test-linux-init.sh $dbdeployer_version
47+
#run ./test/run-mock-tests.sh
48+
#run ./test/docker-test.sh $dbdeployer_version
49+
#run ./test/test-linux-init.sh $dbdeployer_version
4650

‎ts/commands.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"os"
2121
"os/exec"
2222
"path"
23+
"regexp"
2324
"strconv"
2425
"strings"
2526
"testing"
@@ -59,7 +60,9 @@ func findErrorsInLogFile(ts *testscript.TestScript, neg bool, args []string) {
5960
ts.Check(err)
6061
hasError := strings.Contains(string(contents), "ERROR")
6162
if neg && hasError {
62-
ts.Fatalf("ERRORs found in %s\n", logFile)
63+
reLines := regexp.MustCompile(`(?sg)(^.*ERROR.*)`)
64+
errorLines := reLines.FindAll(contents, -1)
65+
ts.Fatalf("ERRORs found in %s (%s)\n", logFile, errorLines)
6366
}
6467
if !neg && !hasError {
6568
ts.Fatalf("ERRORs not found in %s\n", logFile)

0 commit comments

Comments
 (0)