Skip to content

Commit aaad725

Browse files
committed
Removing Tor Onion v2 address support
1 parent 3e1d742 commit aaad725

File tree

7 files changed

+141
-372
lines changed

7 files changed

+141
-372
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
- zmq
2828
- url
2929
- websockets
30-
- vendored_openssl
3130
steps:
3231
- uses: actions/checkout@v2
3332
- name: Install dependencies
33+
if: startsWith(matrix.feature, 'zmq')
3434
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
3535
- name: Install rust stable
3636
uses: actions-rs/toolchain@v1
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
fail-fast: false
5454
matrix:
55-
os: [ ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2019 ]
55+
os: [ ubuntu-18.04, ubuntu-latest, macos-10.15, macos-11.0, windows-latest ]
5656
steps:
5757
- uses: actions/checkout@v2
5858
- name: Install linux dependencies
@@ -87,7 +87,7 @@ jobs:
8787
steps:
8888
- uses: actions/checkout@v2
8989
- name: Install dependencies
90-
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
90+
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
9191
- name: Install rust stable
9292
uses: actions-rs/toolchain@v1
9393
with:
@@ -108,47 +108,38 @@ jobs:
108108
strategy:
109109
fail-fast: false
110110
matrix:
111-
toolchain: [ nightly, beta, stable, 1.45.0 ]
111+
toolchain: [ nightly, beta, stable, 1.47.0 ]
112112
steps:
113113
- uses: actions/checkout@v2
114114
- name: Install dependencies
115-
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
115+
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
116116
- name: Install rust ${{ matrix.toolchain }}
117117
uses: actions-rs/toolchain@v1
118118
with:
119119
toolchain: ${{ matrix.toolchain }}
120120
override: true
121-
- name: All features
121+
- name: Regenerate Cargo.lock
122+
if: startsWith(matrix.toolchain, '1.')
122123
uses: actions-rs/cargo@v1
123124
with:
124-
command: check
125-
args: --workspace --all-targets --all-features
126-
toolchains-old:
127-
runs-on: ubuntu-latest
128-
strategy:
129-
fail-fast: false
130-
matrix:
131-
toolchain: [ 1.41.1 ]
132-
steps:
133-
- uses: actions/checkout@v2
134-
- name: Install dependencies
135-
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
136-
- name: Install rust ${{ matrix.toolchain }}
137-
uses: actions-rs/toolchain@v1
125+
command: generate-lockfile
126+
- name: Pin versions
127+
if: startsWith(matrix.toolchain, '1.')
128+
uses: actions-rs/cargo@v1
138129
with:
139-
toolchain: ${{ matrix.toolchain }}
140-
override: true
141-
- name: Custom features
130+
command: update
131+
args: -p zeroize --precise "1.2.0"
132+
- name: All features
142133
uses: actions-rs/cargo@v1
143134
with:
144135
command: check
145-
args: --workspace --all-targets --features=lnp,websockets,url,keygen,serde,bulletproofs
136+
args: --workspace --all-targets --all-features
146137
dependency:
147138
runs-on: ubuntu-latest
148139
steps:
149140
- uses: actions/checkout@v2
150141
- name: Install dependencies
151-
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
142+
run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
152143
- name: Install latest stable
153144
uses: actions-rs/toolchain@v1
154145
with:
@@ -184,7 +175,7 @@ jobs:
184175
- name: Install dependencies
185176
run: |
186177
sudo apt-get update
187-
sudo apt-get install -y libpcre3-dev libssl-dev
178+
sudo apt-get install -y libpcre3-dev
188179
- name: set environment variables
189180
run: |
190181
ANDROID_SDK_ROOT="$GITHUB_WORKSPACE/sdk"

0 commit comments

Comments
 (0)