Skip to content

Commit

Permalink
Merge branch 'master' into feat/au-storage-fee-and-ce
Browse files Browse the repository at this point in the history
  • Loading branch information
ashutoshvarma committed Oct 16, 2023
2 parents dde42c1 + 25eec60 commit 18cb574
Show file tree
Hide file tree
Showing 47 changed files with 1,365 additions and 7,012 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,29 @@ jobs:
native-macos:
needs: checks-and-tests
runs-on: macos-latest
env:
RUSTC_WRAPPER: "sccache"
SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }}
SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }}
SCCACHE_S3_KEY_PREFIX: "astar-macos"
permissions:
id-token: write
contents: read
steps:
- name: Checkout the source code
uses: actions/checkout@v3
with:
submodules: true

- name: configure aws credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SCCACHE_ROLE }}
role-session-name: github_astar_mac
aws-region: ${{ secrets.SCCACHE_REGION }}

- name: Install deps
run: brew install protobuf
run: brew install protobuf sccache

- name: Install & display rust toolchain
run: rustup show
Expand All @@ -223,6 +238,9 @@ jobs:
- name: Build optimized binary
run: cargo build --release --verbose --locked

- name: Show sccache stats
run: sccache --show-stats

- uses: actions/upload-artifact@v3
with:
name: astar-macOS-latest-x86_64
Expand Down
82 changes: 12 additions & 70 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,11 @@ polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", bra
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }

# Temporary, to ensure `runtime-benchmarks` features can compile
polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }

# XCM
# (wasm)
cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
Expand All @@ -278,7 +276,6 @@ pallet-collator-selection = { path = "./pallets/collator-selection", default-fea
pallet-dapps-staking = { path = "./pallets/dapps-staking", default-features = false }
pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false }
pallet-xvm = { path = "./pallets/xvm", default-features = false }
pallet-xcm = { path = "./pallets/pallet-xcm", default-features = false }
pallet-ethereum-checked = { path = "./pallets/ethereum-checked", default-features = false }
pallet-dynamic-evm-base-fee = { path = "./pallets/dynamic-evm-base-fee", default-features = false }
pallet-unified-accounts = { path = "./pallets/unified-accounts", default-features = false }
Expand All @@ -292,7 +289,6 @@ pallet-evm-precompile-substrate-ecdsa = { path = "./precompiles/substrate-ecdsa"
pallet-evm-precompile-xcm = { path = "./precompiles/xcm", default-features = false }
pallet-evm-precompile-xvm = { path = "./precompiles/xvm", default-features = false }
pallet-evm-precompile-dapps-staking = { path = "./precompiles/dapps-staking", default-features = false }
pallet-evm-precompile-batch = { path = "./precompiles/batch", default-features = false }

pallet-chain-extension-dapps-staking = { path = "./chain-extensions/dapps-staking", default-features = false }
pallet-chain-extension-xvm = { path = "./chain-extensions/xvm", default-features = false }
Expand Down
2 changes: 2 additions & 0 deletions chain-extensions/xvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ log = { workspace = true }
num-traits = { workspace = true }
pallet-contracts = { workspace = true }
pallet-contracts-primitives = { workspace = true }
pallet-unified-accounts = { workspace = true }
parity-scale-codec = { workspace = true }
scale-info = { workspace = true }
sp-core = { workspace = true }
Expand All @@ -34,6 +35,7 @@ std = [
"num-traits/std",
"pallet-contracts/std",
"pallet-contracts-primitives/std",
"pallet-unified-accounts/std",
"scale-info/std",
"sp-std/std",
"sp-core/std",
Expand Down
Loading

0 comments on commit 18cb574

Please sign in to comment.