This repository has been archived by the owner on Oct 23, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: use the Ed25519 key instead of RSA by default; removes openssl dep
Signed-off-by: ljedrz <[email protected]>
- Loading branch information
Showing
7 changed files
with
39 additions
and
237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,28 +84,18 @@ jobs: | |
- name: Install dependencies ubuntu | ||
if: matrix.platform.host == 'ubuntu-latest' | ||
run: sudo apt-get install llvm-dev libssl-dev pkg-config | ||
run: sudo apt-get install llvm-dev pkg-config | ||
|
||
- name: Install dependencies macos | ||
if: matrix.platform.host == 'macos-latest' | ||
run: brew install llvm openssl | ||
run: brew install llvm | ||
|
||
- name: Download go-ipfs on Linux | ||
if: matrix.platform.host == 'ubuntu-latest' | ||
run: | | ||
curl -L https://github.com/ipfs/go-ipfs/releases/download/v0.6.0/go-ipfs_v0.6.0_linux-amd64.tar.gz --output go_ipfs.tar.gz | ||
tar -xf go_ipfs.tar.gz | ||
- name: Install dependencies windows (openssl) | ||
uses: lukka/[email protected] | ||
id: windows-runvcpkg | ||
if: matrix.platform.host == 'windows-latest' | ||
with: | ||
vcpkgDirectory: '${{ runner.workspace }}/vcpkg' | ||
vcpkgTriplet: 'x64-windows' | ||
vcpkgArguments: 'openssl' | ||
vcpkgGitCommitId: 'ffa41582f78478812c836a6e8ce315fb27431182' # ok for openssl-sys v0.9.58 | ||
|
||
- name: Install rust toolchain | ||
uses: hecrj/setup-rust-action@v1 | ||
with: | ||
|
@@ -132,13 +122,11 @@ jobs: | |
|
||
- name: Build (android) | ||
if: contains(matrix.platform.target, 'android') | ||
run: cargo ndk --android-platform 29 --target ${{ matrix.platform.target }} build --locked --workspace --exclude ipfs-http | ||
# exclude http on android because openssl | ||
run: cargo ndk --android-platform 29 --target ${{ matrix.platform.target }} build --locked --workspace | ||
|
||
- name: Build other cross compilations | ||
if: contains(matrix.platform.target, 'android') == false && matrix.platform.cross == true | ||
run: cargo build --locked --workspace --exclude ipfs-http --target ${{ matrix.platform.target }} | ||
# exclude http on other cross compilation targets because openssl | ||
run: cargo build --locked --workspace --target ${{ matrix.platform.target }} | ||
|
||
- name: Rust tests (macos) | ||
if: matrix.platform.cross == false && matrix.platform.host == 'macos-latest' | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- node_modules/ipfsd-ctl/src/ipfsd-daemon.js | ||
+++ node_modules/ipfsd-ctl/src/ipfsd-daemon.js | ||
@@ -88,7 +88,6 @@ class Daemon { | ||
const opts = merge( | ||
{ | ||
emptyRepo: false, | ||
- bits: this.opts.test ? 1024 : 2048, | ||
profiles: this.opts.test ? ['test'] : [] | ||
}, | ||
typeof this.opts.ipfsOptions.init === 'boolean' ? {} : this.opts.ipfsOptions.init, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.