Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to ink 5.0.0-rc2 #63

Merged
merged 9 commits into from
Mar 6, 2024
Merged

Update to ink 5.0.0-rc2 #63

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ab113a
Update to ink 5.0.0-rc2
smiasojed Mar 1, 2024
e7a3ead
Update version
smiasojed Mar 1, 2024
b94e192
Fix ink dep
smiasojed Mar 4, 2024
6a6b145
Fix static-buffer tests
smiasojed Mar 4, 2024
bb09426
Fix static-buffer
smiasojed Mar 4, 2024
a7480ab
Add cleanup before test of static-buffer
smiasojed Mar 4, 2024
f898413
cleanup
smiasojed Mar 4, 2024
6ec13d9
Remove multi-contract-caller from test in subdirectories
smiasojed Mar 4, 2024
6510e7d
Remove call-builder-return-value
smiasojed Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,20 @@ jobs:
.vscode/**
**/.gitignore
**/*.md
multi-contract-caller/**
upgradeable-contracts/**
workspace-contracts/**
ui/**
**/frontend/**
json: true

- name: Look for changes in multi and upgradable contracts
id: CHANGED_MULTI_AND_UPGRADEABLE_CONTRACTS
- name: Look for changes in upgradable contracts
id: CHANGED_UPGRADEABLE_CONTRACTS
uses: tj-actions/changed-files@v41
with:
dir_names: "true"
dir_names_exclude_current_dir: "true"
dir_names_max_depth: 2
files: |
multi-contract-caller/**
upgradeable-contracts/**
files_ignore: |
**/.gitignore
Expand Down Expand Up @@ -103,7 +101,7 @@ jobs:
run: |
ALL_CHANGED_CONTRACTS=$(jq -s 'add' \
<(echo "${{ steps.CHANGED_CONTRACTS.outputs.all_changed_files }}") \
<(echo "${{ steps.CHANGED_MULTI_AND_UPGRADEABLE_CONTRACTS.outputs.all_changed_files }}"))
<(echo "${{ steps.CHANGED_UPGRADEABLE_CONTRACTS.outputs.all_changed_files }}"))

if [ ${{steps.CHANGED_WORKSPACE_CONTRACTS.outputs.all_changed_files }} = "[]" ]
then
Expand Down Expand Up @@ -220,9 +218,15 @@ jobs:
run: cargo contract build --verbose --manifest-path=${{ matrix.contract }}/Cargo.toml;

- name: Test ${{ matrix.contract }} on ${{ matrix.platform }}-${{ matrix.toolchain }}
if: runner.os != 'Windows' && matrix.contract != 'workspace-contracts'
if: runner.os != 'Windows' && matrix.contract != 'workspace-contracts' && matrix.contract != 'static-buffer'
run: cargo test --verbose --manifest-path=${{ matrix.contract }}/Cargo.toml;

- name: Test ${{ matrix.contract }} on ${{ matrix.platform }}-${{ matrix.toolchain }}
if: runner.os != 'Windows' && matrix.contract == 'static-buffer'
run: |
cargo clean --manifest-path=${{ matrix.contract }}/Cargo.toml
INK_STATIC_BUFFER_SIZE=30 cargo test --verbose --manifest-path=${{ matrix.contract }}/Cargo.toml

- name: Build workspace ${{ matrix.contract }} on ${{ matrix.platform }}-${{ matrix.toolchain }}
if: runner.os != 'Windows' && matrix.contract == 'workspace-contracts'
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Have a look at the different examples to better understand how to use ink! to bu

### Can I add a new example here?

Please don't add them here, but create a Pull Request to the `integration-tests` folder in [the ink! repository](https://github.com/paritytech/ink) instead.
Please don't add them here, but create a Pull Request to the `integration-tests/public` folder in [the ink! repository](https://github.com/paritytech/ink) instead.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice touch ;-).

The content of that folder is synchronized with this repository on new releases.

## Preparation
Expand Down
6 changes: 3 additions & 3 deletions basic-contract-caller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[package]
name = "basic-contract-caller"
version = "5.0.0-rc.1"
version = "5.0.0-rc.2"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false

[dependencies]
ink = { version = "5.0.0-rc.1", default-features = false }
ink = { version = "5.0.0-rc.2", default-features = false }

# Note: We **need** to specify the `ink-as-dependency` feature.
#
# If we don't we will end up with linking errors!
other-contract = { path = "other-contract", default-features = false, features = ["ink-as-dependency"] }

[dev-dependencies]
ink_e2e = { version = "5.0.0-rc.1" }
ink_e2e = { version = "5.0.0-rc.2" }

[lib]
path = "lib.rs"
Expand Down
6 changes: 3 additions & 3 deletions basic-contract-caller/other-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "other-contract"
version = "5.0.0-rc.1"
version = "5.0.0-rc.2"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false

[dependencies]
ink = { version = "5.0.0-rc.1", default-features = false }
ink = { version = "5.0.0-rc.2", default-features = false }

[dev-dependencies]
ink_e2e = { version = "5.0.0-rc.1" }
ink_e2e = { version = "5.0.0-rc.2" }

[lib]
path = "lib.rs"
Expand Down
27 changes: 27 additions & 0 deletions call-builder-return-value/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[package]
name = "call_builder_return_value"
version = "5.0.0-rc.2"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false

[dependencies]
ink = { version = "5.0.0-rc.2", default-features = false }

incrementer = { path = "../incrementer", default-features = false, features = ["ink-as-dependency"] }

[dev-dependencies]
ink_e2e = { version = "5.0.0-rc.2" }

[lib]
path = "lib.rs"

[features]
default = ["std"]
std = [
"ink/std",

"incrementer/std",
]
ink-as-dependency = []
e2e-tests = []
Loading
Loading