ci: fix ios libwallet build on github actions
Apologies my WIP commits got merged with - this reverts those since macos/ios was commented out
@@ -24,14 +24,10 @@ jobs:
# Build and package the libraries
- name: Build libwallet
id: build-libwallet
- run: |
- PLATFORMS="x86_64-linux-android;aarch64-linux-android;armv7-linux-androideabi"
- LEVEL=24
- SRCDIR=$(pwd)
- echo $SRCDIR
- chmod +x .github/scripts/libwallet/*.sh
- .github/scripts/libwallet/setup.sh
- .github/scripts/libwallet/entrypoint.sh $PLATFORMS $LEVEL $SRCDIR $GITHUB_REF
+ uses: tari-project/action-buildlibs@master
+ with:
+ platforms: "x86_64-linux-android;aarch64-linux-android;armv7-linux-androideabi"
+ level: "24"
# Upload artifacts to Github
- name: Upload artifacts
uses: actions/upload-artifact@v2
@@ -52,36 +48,36 @@ jobs:
AWS_REGION: "us-east-1" # optional: defaults to us-east-1
SOURCE_DIR: "$GITHUB_WORKSPACE/libwallet"
DEST_DIR: "libwallet"
- # ios:
- # runs-on: macos-10.15
- # steps:
- # - uses: actions/checkout@v2
- # - uses: actions-rs/toolchain@v1
- # with:
- # toolchain: nightly-2021-11-20
- # target: aarch64-apple-ios
- # components: rustfmt
- # override: true
- # - uses: actions-rs/toolchain@v1
- # with:
- # toolchain: nightly-2021-11-20
- # target: x86_64-apple-ios
- # components: rustfmt
- # override: true
- # - name: Install macOS dependencies
- # run: brew install cmake zip
- # - name: Build
- # run: |
- # mkdir -p MobileWallet/TariLib/
- # cd base_layer/wallet_ffi
- # mv ios.config build.config
- # ./mobile_build.sh || exit 1
- # ls -alht $GITHUB_WORKSPACE/MobileWallet/TariLib/
- # - name: Upload artifacts
- # uses: actions/upload-artifact@v2
- # with:
- # name: libwallet-ios
- # path: ${{ github.workspace }}/MobileWallet/TariLib/
+ ios:
+ runs-on: macos-10.15
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions-rs/toolchain@v1
+ with:
+ toolchain: nightly-2021-11-20
+ target: aarch64-apple-ios
+ components: rustfmt
+ override: true
+ - uses: actions-rs/toolchain@v1
+ with:
+ toolchain: nightly-2021-11-20
+ target: x86_64-apple-ios
+ components: rustfmt
+ override: true
+ - name: Install macOS dependencies
+ run: brew install cmake zip
+ - name: Build
+ run: |
+ mkdir -p MobileWallet/TariLib/
+ cd base_layer/wallet_ffi
+ mv ios.config build.config
+ ./mobile_build.sh || exit 1
+ ls -alht $GITHUB_WORKSPACE/MobileWallet/TariLib/
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v2
+ with:
+ name: libwallet-ios
+ path: ${{ github.workspace }}/MobileWallet/TariLib/
# "Error: Container action is only supported on Linux"
# - name: Sync to S3
