Skip to content

Commit

Permalink
merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
zjb0807 committed Dec 11, 2023
2 parents 2177b81 + 1fd9251 commit 9fb41e9
Show file tree
Hide file tree
Showing 74 changed files with 1,633 additions and 632 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:
cancel-in-progress: true

env:
TARPAULIN_VERSION: 0.27.1
TARPAULIN_VERSION: 0.27.2
# LIBCLANG_PATH: "/usr/lib/llvm-11/lib" # default `llvm-config --prefix`
CARGO_INCREMENTAL: 0
jobs:
Expand Down Expand Up @@ -46,13 +46,14 @@ jobs:
run: |
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
cargo tarpaulin -v --no-fail-fast --implicit-test-threads --workspace \
-e acala-inspect \
cargo tarpaulin -v --workspace \
-e \
acala acala-cli acala-service \
acala-primitives \
acala-rpc \
acala-runtime runtime-common runtime-integration-tests karura-runtime mandala-runtime \
--exclude-files **/mock.rs **/weights.rs **/weights/*
ethjson evm-jsontests jsontests \
--exclude-files **/mock.rs **/weights.rs **/weights/* --out xml
- name: Upload to codecov.io
uses: codecov/codecov-action@v3
with:
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/extrinsic-ordering-check-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,6 @@ jobs:
if: ${{ env.CHAIN == '' || env.VERSION == '' || env.PREVIOUS_VERSION == '' }}
run: python .github/scripts/extrinsic_check_setup_env.py

- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install Yarn
run: npm install -g yarn

- name: Prepare output
run: |
echo "METADATA COMPARISON" >> output.txt
Expand All @@ -73,11 +65,7 @@ jobs:
- name: Compare the metadata
run: |
git clone https://github.com/ermalkaleci/tools.git
cd tools
yarn install --immutable
yarn run:metadata ws://localhost:9944 ws://localhost:9955 >> ../output.txt
cd ..
docker run --network=host jacogr/polkadot-js-tools metadata ws://127.0.0.1:9944 ws://127.0.0.1:9955 >> output.txt
sed -z -i 's/\n\n/\n/g' output.txt
- name: Show result
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
# Diff new wasm with current
- name: Check the metadata diff
run: |
subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ env.CHAIN }} | tee ${{ env.CHAIN }}-diff.txt
subwasm diff wss://${{ env.CHAIN }}-rpc.aca-api.network ${{ steps.srtool_build.outputs.wasm }} | tee ${{ env.CHAIN }}-diff.txt
# Generate release notes
- name: Generate note
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,9 @@
__pycache__

ts-tests/cache/
ts-tests/.yarn
ts-tests/node_modules/

ts-tests/.yarn/*
!ts-tests/.yarn/patches
!ts-tests/.yarn/plugins
!ts-tests/.yarn/releases
Loading

0 comments on commit 9fb41e9

Please sign in to comment.