Skip to content

Commit

Permalink
Merge tag 'v2.3.1' into release/v2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
briancorbin committed Feb 23, 2023
2 parents c86b9ce + a6c42b9 commit 2ff17f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 26 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,9 @@ jobs:
contents: write
strategy:
matrix:
runner-tags:
[
[self-hosted, macOS, X64],
[self-hosted, macOS, ARM64],
[self-hosted, Linux, large],
]
runner-tags: [[self-hosted, Linux, large]]
namespace: [test, prod]
include:
- runner-tags: [self-hosted, macOS, X64]
container: ""
- runner-tags: [self-hosted, macOS, ARM64]
container: ""
- runner-tags: [self-hosted, Linux, large]
container: mobilecoin/rust-sgx-base:latest
- namespace: test
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,15 @@ jobs:
files: |
${{ steps.current_release.outputs.tag_name }}-Linux-X64-testnet.tar.gz
${{ steps.current_release.outputs.tag_name }}-Linux-X64-mainnet.tar.gz
${{ steps.current_release.outputs.tag_name }}-macOS-X64-testnet.tar.gz
${{ steps.current_release.outputs.tag_name }}-macOS-X64-mainnet.tar.gz
${{ steps.current_release.outputs.tag_name }}-macOS-ARM64-testnet.tar.gz
${{ steps.current_release.outputs.tag_name }}-macOS-ARM64-mainnet.tar.gz
target: /var/tmp/

- name: Extract Release
run: |
rm -rfv build_artifacts
mkdir -pv build_artifacts/Linux-X64-testnet
mkdir -pv build_artifacts/Linux-X64-mainnet
mkdir -pv build_artifacts/macOS-X64-testnet
mkdir -pv build_artifacts/macOS-X64-mainnet
mkdir -pv build_artifacts/macOS-ARM64-testnet
mkdir -pv build_artifacts/macOS-ARM64-mainnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-Linux-X64-testnet.tar.gz -C build_artifacts/Linux-X64-testnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-Linux-X64-mainnet.tar.gz -C build_artifacts/Linux-X64-mainnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-macOS-X64-testnet.tar.gz -C build_artifacts/macOS-X64-testnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-macOS-X64-mainnet.tar.gz -C build_artifacts/macOS-X64-mainnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-macOS-ARM64-testnet.tar.gz -C build_artifacts/macOS-ARM64-testnet
tar xzvf /var/tmp/${{ steps.current_release.outputs.tag_name }}-macOS-ARM64-mainnet.tar.gz -C build_artifacts/macOS-ARM64-mainnet
- name: Create Release
if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -61,10 +49,6 @@ jobs:
cd release
tar -czvf ${{ github.ref_name }}-Linux-X64-testnet.tar.gz -C ../build_artifacts/Linux-X64-testnet/ .
tar -czvf ${{ github.ref_name }}-Linux-X64-mainnet.tar.gz -C ../build_artifacts/Linux-X64-mainnet/ .
tar -czvf ${{ github.ref_name }}-macOS-X64-testnet.tar.gz -C ../build_artifacts/macOS-X64-testnet/ .
tar -czvf ${{ github.ref_name }}-macOS-X64-mainnet.tar.gz -C ../build_artifacts/macOS-X64-mainnet/ .
tar -czvf ${{ github.ref_name }}-macOS-ARM64-testnet.tar.gz -C ../build_artifacts/macOS-ARM64-testnet/ .
tar -czvf ${{ github.ref_name }}-macOS-ARM64-mainnet.tar.gz -C ../build_artifacts/macOS-ARM64-mainnet/ .
- name: Upload Release
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
5 changes: 5 additions & 0 deletions mirror/src/private/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ const SUPPORTED_ENDPOINTS: &[&str] = &[
"validate_confirmation",
"verify_address",
"get_txos",
"get_all_accounts",
"get_all_transaction_logs_for_block",
"get_balance_for_account",
"get_balance_for_address",
"get_transaction_logs_for_account",
];

/// How long do we wait for full-service to reply?
Expand Down

0 comments on commit 2ff17f2

Please sign in to comment.