Skip to content

Commit

Permalink
chore: update c dependencies (#1682)
Browse files Browse the repository at this point in the history 
## Checklist

- [x] I have read the [contribution
guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md)
- [x] reference issue for this pull request:
ooni/probe#2841
- [ ] if you changed anything related to how experiments work and you
need to reflect these changes in the ooni/spec repository, please link
to the related ooni/spec pull request: <!-- add URL here -->
- [ ] if you changed code inside an experiment, make sure you bump its
version number

<!-- Reminder: Location of the issue tracker:
https://github.com/ooni/probe -->

## Description

This diff updates the probe c dependencies to the latest available
version
  • Loading branch information
@DecFox
DecFox authored Feb 9, 2025
1 parent 8b08193 commit 999025c
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
16 changes: 8 additions & 8 deletions internal/cmd/buildtool/android_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1738,12 +1738,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/buildtool/cdepstor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.13.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.14.tar.gz")
deps.VerifySHA256( // must be mockable
"9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28",
"tor-0.4.8.13.tar.gz",
"5047e1ded12d9aac4eb858f7634a627714dd58ce99053d517691a4b304a66d10",
"tor-0.4.8.14.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.13.tar.gz")
_ = deps.MustChdir("tor-0.4.8.13") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.14.tar.gz")
_ = deps.MustChdir("tor-0.4.8.14") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/ios_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1142,12 +1142,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.13.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.13.tar.gz",
"tar", "-xf", "tor-0.4.8.14.tar.gz",
},
}, {
Env: []string{},
Expand Down

0 comments on commit 999025c

Please sign in to comment.