Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade C dependencies #1524

Merged
merged 2 commits into from
Mar 21, 2024
Merged

chore: upgrade C dependencies #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0879056
chore: upgrade C dependencies
bassosimone Mar 21, 2024
d0668b2
fix: upgrade NDK version
bassosimone Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NDKVERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26.1.10909125
26.2.11394342
16 changes: 8 additions & 8 deletions internal/cmd/buildtool/android_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,12 +702,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/buildtool/cdepsopenssl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@3.rb
cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.0.tar.gz")
cdepsMustFetch("https://www.openssl.org/source/openssl-3.2.1.tar.gz")
deps.VerifySHA256( // must be mockable
"14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e",
"openssl-3.2.0.tar.gz",
"83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39",
"openssl-3.2.1.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "openssl-3.2.0.tar.gz")
_ = deps.MustChdir("openssl-3.2.0") // must be mockable
must.Run(log.Log, "tar", "-xf", "openssl-3.2.1.tar.gz")
_ = deps.MustChdir("openssl-3.2.1") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "openssl")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/ios_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.0.tar.gz",
"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "openssl-3.2.0.tar.gz",
"tar", "-xf", "openssl-3.2.1.tar.gz",
},
}, {
Env: []string{},
Expand Down
Loading