Skip to content

Commit 02b4ff4

Browse files
author
Roy Yang
committed
Merge branch 'fee_distribution' of ssh://github.com/AcalaNetwork/Acala into fee_distribution
* 'fee_distribution' of ssh://github.com/AcalaNetwork/Acala: (31 commits) update polkadot-v0.9.23 (#2183) make sure acala precompiles are called only from other contracts (#2202) remove AccountId from XcmFeeToTreasury Acala XcmFeeToTreasury fix precompile array encode & other improvements (#2196) move HomaTreasuryPalletId to common update loan proxy type (#2200) Add bifrost (#2199) fix benchmark build_pool_percents helper method benchmark update to v0.9.22 refactor weight trader (#2178) fix with_fee_currency (#2194) Support arm64 (#2107) add Homa to ProxyType (#2191) disable with_fee_paid_by (#2187) Convert rebase token amount when calculate swap amount for StableAsset (#2169) 2.7.0 (#2186) fix origin of erc20 xtokens transfer (#2180) ... # Conflicts: # modules/cdp-engine/src/lib.rs
2 parents f609940 + 2973996 commit 02b4ff4

File tree

227 files changed

+21777
-11433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+21777
-11433
lines changed

.github/workflows/docker.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ jobs:
2727
- uses: actions/checkout@v3
2828
with:
2929
submodules: recursive
30+
- name: Set up QEMU
31+
uses: docker/setup-qemu-action@v2
3032
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v1
33+
uses: docker/setup-buildx-action@v2
3234
- name: Login to GitHub Container Registry
33-
uses: docker/login-action@v1
35+
uses: docker/login-action@v2
3436
with:
3537
registry: ghcr.io
3638
username: ${{ github.actor }}
@@ -47,10 +49,14 @@ jobs:
4749
type=ref,event=branch
4850
type=ref,event=pr
4951
type=sha
52+
- name: Change Dockerfile to support multi-platform
53+
run: |
54+
sed -i 's/FROM /FROM --platform=$BUILDPLATFORM /g' scripts/Dockerfile
5055
- name: Build and push Docker image
51-
uses: docker/build-push-action@v2
56+
uses: docker/build-push-action@v3
5257
with:
5358
context: .
59+
platforms: linux/amd64,linux/arm64
5460
push: true
5561
tags: ${{ steps.meta.outputs.tags }}
5662
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
run: cargo clippy --features with-karura-runtime -- -D warnings
5555
- name: Run acala-runtime clippy
5656
run: cargo clippy --features with-acala-runtime -- -D warnings
57+
- name: Run build benches
58+
run: make build-benches
5759
benchmarking:
5860
runs-on: [self-hosted, linux]
5961
env:

0 commit comments

Comments
 (0)