Skip to content

Commit 82c595d

Browse files
committed
ci: Update clippy-examples and examples-contract-build-riscv
1 parent 76af73f commit 82c595d

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ jobs:
174174
type: [STD, RISCV]
175175
env:
176176
# TODO: (@davidsemakula) Update all manifests for integration-tests and remove this
177-
RUSTFLAGS: --check-cfg cfg(ink_abi,values("ink","sol","all"))
177+
# i.e. update with equivalent of setting `--check-cfg cfg(ink_abi,values("ink","sol","all"))`
178+
ALLOWED_LINTS: -A unexpected_cfgs
178179
steps:
179180
- name: Checkout
180181
uses: actions/checkout@v4
@@ -194,7 +195,7 @@ jobs:
194195
with:
195196
command: |
196197
scripts/for_all_contracts_exec.sh --path integration-tests -- cargo clippy --all-targets \
197-
--manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED
198+
--manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED $ALLOWED_LINTS
198199
199200
- name: Run Clippy for RISC-V Examples
200201
uses: ./.github/run-container-command
@@ -203,7 +204,7 @@ jobs:
203204
command: |
204205
scripts/for_all_contracts_exec.sh --path integration-tests -- cargo clippy --no-default-features \
205206
--target ${CLIPPY_TARGET} \
206-
--manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED
207+
--manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED $ALLOWED_LINTS
207208
208209
check:
209210
runs-on: ubuntu-latest
@@ -742,19 +743,36 @@ jobs:
742743
- name: Build Contract Examples for RISC-V
743744
uses: ./.github/run-container-command
744745
env:
745-
RUSTC_BOOTSTRAP: 1
746746
MANIFEST_PATH: ""
747747
CONTRACT_SIZE_FILE: "measurements-${{ env.MEASUREMENTS_ID }}/contract_size_"
748748
CARGO_INCREMENTAL: 0
749749
with:
750750
command: |
751751
mkdir -p measurements-${{ env.MEASUREMENTS_ID }}/
752752
scripts/for_all_contracts_exec2.sh --path integration-tests -- \
753+
--ignore solidity-abi/sol-cross-contract --ignore solidity-abi/sol-encoding \
754+
--ignore solidity-abi/solidity-calls-flipper --ignore solidity-abi/events \
755+
--ignore solidity-abi/trait-flipper --ignore solidity-abi/trait-dyn-cross-contract-calls \
753756
scripts/build_and_determine_contract_size.sh {}
754757
755758
#bash -c "scripts/build_and_determine_contract_size.sh {} >> ${CONTRACT_SIZE_FILE} && \
756759
#sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' ${CONTRACT_SIZE_FILE}"
757760

761+
# NOTE: Sharing build artifacts (i.e. via a shared cargo target directory) with other contracts
762+
# that don't have the same ABI set makes the builds fail.
763+
- name: Build Contract Examples for RISC-V (Solidity ABI)
764+
uses: ./.github/run-container-command
765+
env:
766+
MANIFEST_PATH: ""
767+
CONTRACT_SIZE_FILE: "measurements-${{ env.MEASUREMENTS_ID }}/contract_size_"
768+
CARGO_INCREMENTAL: 0
769+
CARGO_TARGET_DIR: ${{ env.CARGO_TARGET_DIR }}/sol-abi
770+
with:
771+
command: |
772+
mkdir -p measurements-${{ env.MEASUREMENTS_ID }}/
773+
scripts/for_all_contracts_exec2.sh --path integration-tests/solidity-abi -- \
774+
scripts/build_and_determine_contract_size.sh {}
775+
758776
- uses: actions/upload-artifact@v4
759777
with:
760778
path: ./measurements-${{ env.MEASUREMENTS_ID }}/*

0 commit comments

Comments
 (0)