Skip to content

Commit d9d3bc5

Browse files
authored
feat: remove openssl dependency by using rustls-tls feature in reqwest (#282)
* feat: remove openssl dependency by using rustls-tls feature in reqwest * fix: allow blocking for now as degit isn't async * fix: fmt and lifetime issue * fix: use released version * feat: add windows targets to github artifacts Added newline to changelog to trigger test build * feat: add windows targets to registry-cli and test it * fix: fmt * fix
1 parent 35bb6b7 commit d9d3bc5

File tree

9 files changed

+315
-1321
lines changed

9 files changed

+315
-1321
lines changed

.github/workflows/cd-registry-cli.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
# - target: aarch64-pc-windows-msvc
38-
# os: windows-2022
37+
- target: aarch64-pc-windows-msvc
38+
os: windows-2022
3939
- target: x86_64-unknown-linux-gnu
4040
os: ubuntu-22.04
4141
- target: x86_64-apple-darwin
4242
os: macos-14
43-
# - target: x86_64-pc-windows-msvc
44-
# os: windows-2022
43+
- target: x86_64-pc-windows-msvc
44+
os: windows-2022
4545
# - target: x86_64-unknown-linux-musl
4646
# os: ubuntu-22.04
4747
- target: aarch64-unknown-linux-gnu
@@ -73,9 +73,6 @@ jobs:
7373
run: sudo apt-get update && sudo apt-get -y install libudev-dev libdbus-1-dev
7474
- uses: taiki-e/install-action@cross
7575
if: contains(matrix.target, '-musl')
76-
- name: Use static openssl
77-
run: echo "OPENSSL_STATIC=1" >> $GITHUB_ENV
78-
if: startsWith(matrix.os, 'ubuntu')
7976
- uses: taiki-e/upload-rust-binary-action@v1
8077
with:
8178
bin: stellar-registry
@@ -86,5 +83,4 @@ jobs:
8683
token: ${{ secrets.GITHUB_TOKEN }}
8784
dry-run: ${{ github.event_name == 'pull_request' }}
8885
env:
89-
OPENSSL_STATIC: ${{ env.OPENSSL_STATIC }}
9086
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc

.github/workflows/cd-scaffold-cli.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
# - target: aarch64-pc-windows-msvc
38-
# os: windows-2022
37+
- target: aarch64-pc-windows-msvc
38+
os: windows-2022
3939
- target: x86_64-unknown-linux-gnu
4040
os: ubuntu-22.04
4141
- target: x86_64-apple-darwin
4242
os: macos-14
43-
# - target: x86_64-pc-windows-msvc
44-
# os: windows-2022
43+
- target: x86_64-pc-windows-msvc
44+
os: windows-2022
4545
# - target: x86_64-unknown-linux-musl
4646
# os: ubuntu-22.04
4747
- target: aarch64-unknown-linux-gnu
@@ -73,9 +73,6 @@ jobs:
7373
run: sudo apt-get update && sudo apt-get -y install libudev-dev libdbus-1-dev
7474
- uses: taiki-e/install-action@cross
7575
if: contains(matrix.target, '-musl')
76-
- name: Use static openssl
77-
run: echo "OPENSSL_STATIC=1" >> $GITHUB_ENV
78-
if: startsWith(matrix.os, 'ubuntu')
7976
- uses: taiki-e/upload-rust-binary-action@v1
8077
with:
8178
bin: stellar-scaffold
@@ -86,5 +83,4 @@ jobs:
8683
token: ${{ secrets.GITHUB_TOKEN }}
8784
dry-run: ${{ github.event_name == 'pull_request' }}
8885
env:
89-
OPENSSL_STATIC: ${{ env.OPENSSL_STATIC }}
9086
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc

0 commit comments

Comments
 (0)