Skip to content

Commit

Permalink
Merge pull request #5 from jeffijoe/fix/rustls
Browse files Browse the repository at this point in the history
Use Rustls instead of OpenSSL + use clang for C/C++ compilation
  • Loading branch information
jeffijoe authored Jun 13, 2023
2 parents 08c3bd5 + 1ca27de commit f9b7828
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 230 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ linker = "arm-linux-gnueabihf-gcc"
[target.x86_64-unknown-linux-musl]
linker = "rust-lld"

[target.i686-unknown-linux-musl]
linker = "rust-lld"

# Use the sparse registry protocol for Cargo.
[registries.crates-io]
protocol = "sparse"
14 changes: 10 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,7 @@ jobs:
os: windows-latest
artifact_name: deltio.exe
asset_name: deltio-${{ needs.tag.outputs.tag }}-windows-x86_64
- target: aarch64-pc-windows-msvc
os: windows-latest
artifact_name: deltio.exe
asset_name: deltio-${{ needs.tag.outputs.tag }}-windows-aarch64

steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -180,6 +177,15 @@ jobs:
sudo apt-get install -y ${{ matrix.install_linker }}
fi
# We need to use clang because `ring` (used by `rustls`) won't compile with gcc.
- name: Configure clang as C and C++ compiler (Linux)
# Don't use clang for aarch64 musl Linux, as we're installing a special cross-compiler
# for that target.
if: ${{ matrix.os == 'ubuntu-latest' && matrix.target != 'aarch64-unknown-linux-musl' }}
run: |
echo "CC=clang" >> "$GITHUB_ENV"
echo "CXX=clang++" >> "$GITHUB_ENV"
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
Expand Down
Loading

0 comments on commit f9b7828

Please sign in to comment.