Skip to content

Commit d7d495e

Browse files
author
Itzik Grossman
committed
Merged CW 1.1.9 (set to 1.1.0 on our packages)
Fixed package tests & hackatom tests (not integration tests obv)
1 parent dcffea8 commit d7d495e

File tree

114 files changed

+989
-16619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+989
-16619
lines changed

.github/workflows/ci.yml

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,67 @@
11
name: Contract Development
22

3-
# Pushes to long living branches and all PRs
4-
on:
5-
push:
6-
branches:
7-
- main
8-
- 0.[0-9]+
9-
pull_request:
3+
## Pushes to long living branches and all PRs
4+
#on:
5+
# push:
6+
# branches:
7+
# - secret
8+
# - 0.[0-9]+
9+
# pull_request:
1010

1111
env:
1212
RUST_BACKTRACE: 1
1313

1414
jobs:
15+
test-packages:
16+
name: Package Tests for ${{ matrix.build }} ${{ matrix.rust }}
17+
runs-on: ${{ matrix.os }}
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
os: [ ubuntu-latest, macos-latest, windows-latest ]
22+
rust: [ 1.59.0, stable ]
23+
24+
steps:
25+
- name: Checkout sources
26+
uses: actions/checkout@v3
27+
- name: Install Rust
28+
uses: actions-rs/toolchain@v1
29+
with:
30+
toolchain: ${{ matrix.rust }}
31+
target: wasm32-unknown-unknown
32+
profile: minimal
33+
override: true
34+
- name: Build std
35+
run: cargo build
36+
- name: Test std
37+
run: cargo test
38+
1539
test-hackatom:
16-
name: ${{ matrix.build }}
40+
name: Contract Tests for ${{ matrix.build }} ${{ matrix.rust }}
1741
runs-on: ${{ matrix.os }}
1842
strategy:
1943
fail-fast: false
2044
matrix:
21-
include:
22-
- build: macOS
23-
os: macOS-latest
24-
- build: Windows
25-
os: windows-latest
45+
os: [ ubuntu-latest, macos-latest, windows-latest ]
46+
rust: [ 1.59.0, stable ]
47+
2648
defaults:
2749
run:
2850
shell: bash
2951
working-directory: ./contracts/hackatom
3052
steps:
3153
- name: Checkout sources
32-
uses: actions/checkout@v2
54+
uses: actions/checkout@v3
3355
- name: Install Rust
3456
uses: actions-rs/toolchain@v1
3557
with:
36-
toolchain: 1.59.0
58+
toolchain: ${{ matrix.rust }}
3759
target: wasm32-unknown-unknown
3860
profile: minimal
3961
override: true
4062
- name: Build hackatom wasm
4163
run: cargo wasm --locked
4264
- name: Unit Test hackatom
4365
run: cargo unit-test --locked
44-
- name: Integration Test hackatom
45-
run: cargo integration-test --locked
66+
# - name: Integration Test hackatom
67+
# run: cargo integration-test --locked

.github/workflows/lint.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
on: [push, pull_request]
2+
3+
name: Static Checks
4+
5+
jobs:
6+
lints:
7+
name: ${{ matrix.make.name }} ${{ matrix.rust }} (${{ matrix.os }})
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
os: [ubuntu-latest, macos-latest, windows-latest]
13+
rust: [1.59.0, stable]
14+
make:
15+
- name: Clippy
16+
task: "cargo clippy"
17+
18+
env:
19+
RUST_BACKTRACE: full
20+
RUSTC_WRAPPER: sccache
21+
RUSTV: ${{ matrix.rust }}
22+
SCCACHE_CACHE_SIZE: 2G
23+
SCCACHE_DIR: ${{ matrix.sccache-path }}
24+
# SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
25+
steps:
26+
- uses: actions/checkout@v3
27+
28+
- name: Install Rust
29+
uses: actions-rs/toolchain@v1
30+
with:
31+
toolchain: ${{ matrix.rust }}
32+
target: wasm32-unknown-unknown
33+
profile: minimal
34+
override: true
35+
- name: Install Clippy
36+
if: matrix.make.name == 'Clippy'
37+
run: |
38+
rustup component add clippy
39+
40+
- name: ${{ matrix.make.name }}
41+
run: ${{ matrix.make.task }}
42+

0 commit comments

Comments
 (0)