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

Upgradetor #1146

Merged
merged 6 commits into from
Sep 3, 2024
Merged

Upgradetor #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc543fa
remove old tor n edit git submodule config
justinvforvendetta Sep 2, 2024
b83a81c
new tor ver
justinvforvendetta Sep 2, 2024
6c27a46
try reinstall libevent on macos-14 workflow
justinvforvendetta Sep 2, 2024
4382896
macos-14 build libevent-dir specify, force brew links
justinvforvendetta Sep 3, 2024
2f71fba
wrong symbol, &/@
justinvforvendetta Sep 3, 2024
704ee37
fix typo macos-14 build
justinvforvendetta Sep 3, 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
10 changes: 6 additions & 4 deletions .github/workflows/check-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,20 @@ jobs:
run: |
# A workaround for "The `brew link` step did not complete successfully" error.
brew install --quiet python@3 || brew link --overwrite python@3
brew install --quiet automake autoconf berkeley-db@4 openssl@3 [email protected] miniupnpc zeromq libtool qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb
brew install libevent
brew install --quiet automake autoconf berkeley-db@4 openssl@3 [email protected] pkg-config miniupnpc zeromq libtool qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb
brew upgrade openssl@3 && brew link --force openssl@3
brew upgrade libevent && brew link --force libevent

# brew unlink libevent && curl -L https://raw.githubusercontent.com/vergecurrency/libevent/master/libevent.rb > libevent.rb && brew install libevent.rb

- name: Brew link dependencies
run: brew link [email protected] qt@5 berkeley-db@4 libevent openssl@3
run: brew link [email protected] qt@5 berkeley-db@4 libevent

- name: Auto generate
run: ./autogen.sh

- name: configure
run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib
run: ./configure --disable-bench --disable-tests --disable-dependency-tracking --disable-werror --with-gui --bindir=`pwd`/release/bin --libdir=`pwd`/release/lib --with-libevent-dir=/opt/homebrew/Cellar/libevent/2.1.12_1

- name: make
run: make -j4
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[submodule "src/tor"]
path = src/tor
url = https://github.com/torproject/tor
branch = tor-0.4.7.10
url = https://gitlab.torproject.org/tpo/core/tor
branch = release-0.4.8

2 changes: 1 addition & 1 deletion src/tor
Open in desktop
Submodule tor updated from 7c1601 to 1b1b2b
Loading