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.

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

git: (WARN: requires create merge commit strategy) merge updates from main #173

Merged
merged 4 commits into from
Jul 5, 2024

Conversation

dj8yfo
Copy link
Collaborator

@dj8yfo dj8yfo commented Jul 5, 2024

elliotBraem and others added 4 commits July 3, 2024 15:36
… to latest versions (near#168)

`cargo near new` creates a new contract from template with pre-populated
git workflows.

It seems the versions of near-cli-rs and cargo-near are no longer
compatible, getting error:

```
Error: 
   0: expected `schema_version` to be ~0.3, but got 0.4.0: consider upgrading near-abi to a newer version
```

This pull request updates these two packages to latest versions. I've
validated a successful deploy after modified workflows here:
NEARBuilders/gateway#457 (comment)
## 🤖 New release
* `cargo-near`: 0.6.2 -> 0.6.3

<details><summary><i><b>Changelog</b></i></summary><p>

<blockquote>

##
[0.6.3](near/cargo-near@cargo-near-v0.6.2...cargo-near-v0.6.3)
- 2024-07-03

### Added
- Support passing feature flags to `cargo` invocation
([near#160](near#160))

### Fixed
- Also pass feature flags to ABI build step
([near#161](near#161))

### Other
- Updates near-cli-rs and cargo-near in the new project template to
latest versions ([near#168](near#168))
- Updated dependencies to the latest versions
([near#167](near#167))
- Updated "interactive_clap" to 0.2.10 (updated "flatten" parameter)
([near#154](near#154))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).
@dj8yfo dj8yfo changed the title git: merge updates from main git: (WARN: requires requires create merge commit strategy) merge updates from main Jul 5, 2024
@dj8yfo dj8yfo changed the title git: (WARN: requires requires create merge commit strategy) merge updates from main git: (WARN: requires create merge commit strategy) merge updates from main Jul 5, 2024
@dj8yfo dj8yfo marked this pull request as ready for review July 5, 2024 21:21
@frol frol merged commit fe23c51 into near:source-scan-integration Jul 5, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants