mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-06-02 13:42:14 -04:00
Merge pull request #37 from UnstoppableSwap/tauri-feature-flag
Introducing a feature flag in the swap crate that conditionally enables the tauri depencendy. This allows compiling the swap crate without the heavy tauri dependency. This also enables us to build arm binaries in the CI again. This closes #32 and #34
This commit is contained in:
parent
9f1d58d944
commit
c7c7cf1886
7 changed files with 40 additions and 28 deletions
18
.github/workflows/build-release-binaries.yml
vendored
18
.github/workflows/build-release-binaries.yml
vendored
|
@ -18,11 +18,10 @@ jobs:
|
|||
target: x86_64-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
archive_ext: tar
|
||||
# This has been temporarily disabled. Cross compilation is currently broken due to the missing system dependencies (libwebkit)
|
||||
#- bin: swap
|
||||
# target: armv7-unknown-linux-gnueabihf
|
||||
# os: ubuntu-latest
|
||||
# archive_ext: tar
|
||||
- bin: swap
|
||||
target: armv7-unknown-linux-gnueabihf
|
||||
os: ubuntu-latest
|
||||
archive_ext: tar
|
||||
- bin: swap
|
||||
target: x86_64-apple-darwin
|
||||
os: macos-12
|
||||
|
@ -39,11 +38,10 @@ jobs:
|
|||
target: x86_64-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
archive_ext: tar
|
||||
# This has been temporarily disabled. Cross compilation is currently broken due to the missing system dependencies (libwebkit)
|
||||
#- bin: asb
|
||||
# target: armv7-unknown-linux-gnueabihf
|
||||
# os: ubuntu-latest
|
||||
# archive_ext: tar
|
||||
- bin: asb
|
||||
target: armv7-unknown-linux-gnueabihf
|
||||
os: ubuntu-latest
|
||||
archive_ext: tar
|
||||
- bin: asb
|
||||
target: x86_64-apple-darwin
|
||||
os: macos-12
|
||||
|
|
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -106,8 +106,8 @@ jobs:
|
|||
include:
|
||||
- target: x86_64-unknown-linux-gnu
|
||||
os: ubuntu-latest
|
||||
#- target: armv7-unknown-linux-gnueabihf
|
||||
# os: ubuntu-latest
|
||||
- target: armv7-unknown-linux-gnueabihf
|
||||
os: ubuntu-latest
|
||||
- target: x86_64-apple-darwin
|
||||
os: macos-12
|
||||
- target: aarch64-apple-darwin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue