@@ -174,7 +174,8 @@ jobs:
174
174
type : [STD, RISCV]
175
175
env :
176
176
# 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
178
179
steps :
179
180
- name : Checkout
180
181
uses : actions/checkout@v4
@@ -194,7 +195,7 @@ jobs:
194
195
with :
195
196
command : |
196
197
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
198
199
199
200
- name : Run Clippy for RISC-V Examples
200
201
uses : ./.github/run-container-command
@@ -203,7 +204,7 @@ jobs:
203
204
command : |
204
205
scripts/for_all_contracts_exec.sh --path integration-tests -- cargo clippy --no-default-features \
205
206
--target ${CLIPPY_TARGET} \
206
- --manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED
207
+ --manifest-path {} -- -D warnings -A $CLIPPY_ALLOWED $ALLOWED_LINTS
207
208
208
209
check :
209
210
runs-on : ubuntu-latest
@@ -742,19 +743,36 @@ jobs:
742
743
- name : Build Contract Examples for RISC-V
743
744
uses : ./.github/run-container-command
744
745
env :
745
- RUSTC_BOOTSTRAP : 1
746
746
MANIFEST_PATH : " "
747
747
CONTRACT_SIZE_FILE : " measurements-${{ env.MEASUREMENTS_ID }}/contract_size_"
748
748
CARGO_INCREMENTAL : 0
749
749
with :
750
750
command : |
751
751
mkdir -p measurements-${{ env.MEASUREMENTS_ID }}/
752
752
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 \
753
756
scripts/build_and_determine_contract_size.sh {}
754
757
755
758
# bash -c "scripts/build_and_determine_contract_size.sh {} >> ${CONTRACT_SIZE_FILE} && \
756
759
# sed -ie 's/^integration-tests\/\(public\/\|internal\/\)\?//' ${CONTRACT_SIZE_FILE}"
757
760
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
+
758
776
- uses : actions/upload-artifact@v4
759
777
with :
760
778
path : ./measurements-${{ env.MEASUREMENTS_ID }}/*
0 commit comments