Skip to content

Commit

Permalink
feat: enable optional libtor for macos/linux (#3703)
Browse files Browse the repository at this point in the history
Description
---

Continues from #3641 

Optionally use a built-in Tor process for macos/linux only
  • Loading branch information
Byron Hambly authored Jan 17, 2022
1 parent 347f286 commit 572168f
Show file tree
Hide file tree
Showing 22 changed files with 913 additions and 585 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ jobs:
- checkout
- cucumber-js-ffi


workflows:
version: 2
workflow:
Expand All @@ -140,4 +139,4 @@ workflows:
- run-ffi-integration-tests:
filters:
branches:
ignore: gh-pages
ignore: gh-pages
2 changes: 1 addition & 1 deletion .github/wip_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-08-18
toolchain: nightly-2021-11-20
components: clippy, rustfmt
override: true
- name: dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-18
toolchain: nightly-2021-11-20
components: rustfmt
override: true

Expand Down Expand Up @@ -144,9 +144,9 @@ jobs:

- name: Compile launchpad GUI
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Compile collectibles GUI
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:
args: --all -- --check
- name: Compile NPM
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Clippy check
uses: actions-rs/cargo@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/libwallet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-18
toolchain: nightly-2021-11-20
target: aarch64-apple-ios
components: rustfmt
override: true
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2021-09-18
toolchain: nightly-2021-11-20
target: x86_64-apple-ios
components: rustfmt
override: true
Expand Down
Loading

0 comments on commit 572168f

Please sign in to comment.