pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 01:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Contracts rename riscv-experimental and enable ci tests (#2879)

Browse Source 
- Keep feature name short s/riscv-experimental/riscv
- Add to feature to CI build

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
PG Herveou
2024-01-08 14:11:31 +01:00
committed by GitHub
parent dbff87c268
commit 5daef5d086
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/pipeline/test.yml
+1 -1
View File
@@ -29,7 +29,7 @@ test-linux-stable:
--locked \ --locked \
--release \ --release \
--no-fail-fast \ --no-fail-fast \
--features try-runtime,experimental,ci-only-tests \ --features try-runtime,experimental,riscv,ci-only-tests \
--partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL} --partition count:${CI_NODE_INDEX}/${CI_NODE_TOTAL}
# Upload tests results to Elasticsearch # Upload tests results to Elasticsearch
- echo "Upload test results to Elasticsearch" - echo "Upload test results to Elasticsearch"
substrate/frame/contracts/fixtures/Cargo.toml
+2 -3
View File
@@ -21,9 +21,8 @@ parity-wasm = "0.45.0"
tempfile = "3.8.1" tempfile = "3.8.1"
toml = "0.8.2" toml = "0.8.2"
twox-hash = "1.6.3" twox-hash = "1.6.3"
polkavm-linker = "0.3.0" polkavm-linker = { version = "0.3.0", optional = true }
anyhow = "1.0.0" anyhow = "1.0.0"
[features] [features]
# Enable experimental RISCV fixtures build riscv = ["polkavm-linker"]
riscv-experimental = []
substrate/frame/contracts/fixtures/build.rs
+5 -5
View File
@@ -91,7 +91,7 @@ impl Entry {
} }
/// Return the name of the RISC-V polkavm file. /// Return the name of the RISC-V polkavm file.
#[cfg(feature = "riscv-experimental")] #[cfg(feature = "riscv")]
fn out_riscv_filename(&self) -> String { fn out_riscv_filename(&self) -> String {
format!("{}.polkavm", self.name()) format!("{}.polkavm", self.name())
} }
@@ -232,7 +232,7 @@ fn post_process_wasm(input_path: &Path, output_path: &Path) -> Result<()> {
} }
/// Build contracts for RISC-V. /// Build contracts for RISC-V.
#[cfg(feature = "riscv-experimental")] #[cfg(feature = "riscv")]
fn invoke_riscv_build(current_dir: &Path) -> Result<()> { fn invoke_riscv_build(current_dir: &Path) -> Result<()> {
let encoded_rustflags = let encoded_rustflags =
["-Crelocation-model=pie", "-Clink-arg=--emit-relocs", "-Clink-arg=-Tmemory.ld"] ["-Crelocation-model=pie", "-Clink-arg=--emit-relocs", "-Clink-arg=-Tmemory.ld"]
@@ -267,7 +267,7 @@ fn invoke_riscv_build(current_dir: &Path) -> Result<()> {
bail!("Failed to build contracts"); bail!("Failed to build contracts");
} }
/// Post-process the compiled wasm contracts. /// Post-process the compiled wasm contracts.
#[cfg(feature = "riscv-experimental")] #[cfg(feature = "riscv")]
fn post_process_riscv(input_path: &Path, output_path: &Path) -> Result<()> { fn post_process_riscv(input_path: &Path, output_path: &Path) -> Result<()> {
let mut config = polkavm_linker::Config::default(); let mut config = polkavm_linker::Config::default();
config.set_strip(true); config.set_strip(true);
@@ -286,7 +286,7 @@ fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result
&out_dir.join(&wasm_output), &out_dir.join(&wasm_output),
)?; )?;
#[cfg(feature = "riscv-experimental")] #[cfg(feature = "riscv")]
post_process_riscv( post_process_riscv(
&build_dir.join("target/riscv32em-unknown-none-elf/release").join(entry.name()), &build_dir.join("target/riscv32em-unknown-none-elf/release").join(entry.name()),
&out_dir.join(entry.out_riscv_filename()), &out_dir.join(entry.out_riscv_filename()),
@@ -340,7 +340,7 @@ fn main() -> Result<()> {
invoke_wasm_build(tmp_dir_path)?; invoke_wasm_build(tmp_dir_path)?;
#[cfg(feature = "riscv-experimental")] #[cfg(feature = "riscv")]
invoke_riscv_build(tmp_dir_path)?; invoke_riscv_build(tmp_dir_path)?;
write_output(tmp_dir_path, &out_dir, entries)?; write_output(tmp_dir_path, &out_dir, entries)?;