Skip to content

Commit e448b21

Browse files
authored
Fix CI (#463)
* fix * test * test * test * pin dependencies * fixbuild * fixdoctest --------- Co-authored-by: Allan Rasmussen <allanbrondum@gmail.com>
1 parent 8fdd1b4 commit e448b21

4 files changed

Lines changed: 23 additions & 19 deletions

File tree

.github/workflows/linter.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,19 +283,18 @@ jobs:
283283
with:
284284
submodules: recursive
285285

286-
- name: Install nightly toolchain with check available
287-
uses: actions-rust-lang/setup-rust-toolchain@v1
288-
with:
289-
toolchain: nightly
290-
target: wasm32-unknown-unknown
286+
- name: Install nightly toolchain
287+
run: |
288+
rustup install nightly
289+
rustup +nightly target add wasm32-unknown-unknown
291290
292291
- name: Run no-std build concordium-std
293292
working-directory: concordium-std
294-
run: cargo build --target wasm32-unknown-unknown --no-default-features --features bump_alloc
293+
run: cargo +nightly build --target wasm32-unknown-unknown --no-default-features --features bump_alloc
295294

296295
- name: Run no-std build concordium-cis2
297296
working-directory: concordium-cis2
298-
run: cargo build --target wasm32-unknown-unknown --no-default-features --features concordium-std/bump_alloc
297+
run: cargo +nightly build --target wasm32-unknown-unknown --no-default-features --features concordium-std/bump_alloc
299298

300299
check-no-std-examples:
301300
name: Build on nightly,
@@ -328,17 +327,14 @@ jobs:
328327
with:
329328
submodules: recursive
330329

331-
- name: Install nightly toolchain with check available
332-
uses: actions-rust-lang/setup-rust-toolchain@v1
333-
with:
334-
toolchain: nightly
335-
target: ${{ matrix.target }}
330+
- name: Install nightly toolchain
331+
run: |
332+
rustup install nightly
333+
rustup +nightly target add wasm32-unknown-unknown
336334
337335
- name: Run cargo check with no-std
338-
uses: actions-rs/cargo@v1
339-
with:
340-
command: build
341-
args: --manifest-path ${{ matrix.crates }} --target=${{ matrix.target }} --no-default-features --features=${{ matrix.features }} --features bump_alloc
336+
run: |
337+
cargo +nightly build --manifest-path ${{ matrix.crates }} --target=${{ matrix.target }} --no-default-features --features=${{ matrix.features }} --features bump_alloc
342338
343339
check-crypto-examples:
344340
name: Check crypto examples

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ Cargo.lock
3030
# Nix artifacts
3131
**/*.nix
3232
**/flake.lock
33+
34+
.idea

contract-testing/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@ thiserror = "1.0"
2323
num-bigint = "0.4"
2424
num-integer = "0.1"
2525

26+
# Pin versions to be compatible with 1.73. Remove pins when MSRV is pumped
27+
rayon = ">=1.0, <1.11"
28+
rayon-core = ">=1.0, <1.13"
29+
serde_with = ">=3.0, <3.13"
30+
ed25519-dalek = ">=2.0, <2.2.0"
31+
2632
[dev-dependencies]
2733
rand = "0.8"

contract-testing/src/impls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ impl ChainBuilder {
235235
/// [`micro_ccd_per_euro`][Self::micro_ccd_per_euro].
236236
///
237237
/// # Example
238-
/// ```
238+
/// ```no_run
239239
/// # use concordium_smart_contract_testing::*;
240240
/// let chain = ChainBuilder::new()
241241
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))
@@ -257,7 +257,7 @@ impl ChainBuilder {
257257
/// [`euro_per_energy`][Self::euro_per_energy].
258258
///
259259
/// # Example
260-
/// ```
260+
/// ```no_run
261261
/// # use concordium_smart_contract_testing::*;
262262
/// let chain = ChainBuilder::new()
263263
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))
@@ -298,7 +298,7 @@ impl ChainBuilder {
298298
/// [`block_time`][Self::block_time].
299299
///
300300
/// # Example
301-
/// ```
301+
/// ```no_run
302302
/// # use concordium_smart_contract_testing::*;
303303
/// let chain = ChainBuilder::new()
304304
/// .external_node_connection(Endpoint::from_static("http://node.testnet.concordium.com:20000"))

0 commit comments

Comments
 (0)