浏览代码

Use cargo contract 3.0 in the integration test (#1332)

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
Cyrill Leutwiler 2 年之前
父节点
当前提交
ae907a922f
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      .github/workflows/test.yml
  2. 1 1
      integration/substrate/ink/caller/lib.rs
  3. 1 1
      integration/substrate/package.json

+ 1 - 1
.github/workflows/test.yml

@@ -310,7 +310,7 @@ jobs:
       # We can't run substrate as a github actions service, since it requires
       # command line arguments. See https://github.com/actions/runner/pull/1152
     - name: Start substrate
-      run: echo id=$(docker run -d -p 9944:9944 paritytech/contracts-ci-linux@sha256:dbfd21eb3b023a8cd00be74308a77b624fcc798001889247642b18a8f414e90f substrate-contracts-node --dev --ws-external) >> $GITHUB_OUTPUT
+      run: echo id=$(docker run -d -p 9944:9944 paritytech/contracts-ci-linux@sha256:77a885f3c22d38385b017983c942bf7e063ac127bdc0477670d23a38711a2c38 substrate-contracts-node --dev --ws-external) >> $GITHUB_OUTPUT
       id: substrate
     - uses: actions/setup-node@v3
       with:

+ 1 - 1
integration/substrate/ink/caller/lib.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 #[ink::contract]
 mod caller {

+ 1 - 1
integration/substrate/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "tsc; ts-mocha -t 20000 *.spec.ts",
     "build": "./build.sh",
-    "build-ink": "docker run --rm -v $(pwd)/ink/caller:/opt/contract paritytech/contracts-ci-linux@sha256:dbfd21eb3b023a8cd00be74308a77b624fcc798001889247642b18a8f414e90f sh -c 'cargo install --force --locked cargo-contract --version 2.2.1 && cargo contract build --release --manifest-path /opt/contract/Cargo.toml'"
+    "build-ink": "docker run --rm -v $(pwd)/ink/caller:/opt/contract paritytech/contracts-ci-linux@sha256:77a885f3c22d38385b017983c942bf7e063ac127bdc0477670d23a38711a2c38 cargo contract build --release --manifest-path /opt/contract/Cargo.toml"
   },
   "contributors": [
     {