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

Release v0.1.2 #847

Merged
merged 10 commits into from
Jun 27, 2024
Merged

Release v0.1.2 #847

merged 10 commits into from
Jun 27, 2024

Conversation

veaceslavdoina
Copy link
Contributor

@veaceslavdoina veaceslavdoina commented Jun 27, 2024

PR to create a release v0.1.2.

It contains in diff changes which already were merged #842 on v0.1.1 release. Probably we should do a rebase on merging or maybe a cherry-pick?

GitHub pull request showing commits that are already in target branch

This happens with GitHub when you squash commits merged in from the target branch.

More real diff can be seen here (... --> ..) - https://github.com/codex-storage/nim-codex/compare/release/0.1..master

And more notes about that

  1. When we have a conflicts and GitHub propose us to fix them, result will be comitted to the head-branch which was master and after PR is created, that can't be changed. And we can't accept that and this is why we should consider to use an intermediate branch for that - release-0.1.2-from-master or something similar.

AuHau and others added 10 commits June 20, 2024 10:28
* fix: createReservation lock

* fix: additional locking places

* fix: acquire lock

* chore: feedback

Co-authored-by: markspanbroek <[email protected]>
Signed-off-by: Adam Uhlíř <[email protected]>

* feat: withLock template and fixed tests

* fix: use proc for MockReservations constructor

* chore: feedback

Co-authored-by: Eric <[email protected]>
Signed-off-by: Adam Uhlíř <[email protected]>

* chore: feedback implementation

---------

Signed-off-by: Adam Uhlíř <[email protected]>
Co-authored-by: markspanbroek <[email protected]>
Co-authored-by: Eric <[email protected]>
* fix storestream so it doesn\'t return parity bits for protected/verifiable manifests

* use Cid.example instead of creating a mock manually
* fix verifiable manifest initialization

* fix linearstrategy, use verifiableStrategy to select blocks for slots

* check for both strategies in attribute inheritance test
* Fix verifiable manifest constructor

* Add integration test for verifiable manifest download

Add integration test for testing download of verifiable dataset after creating request for storage

* add missing import

* add testecbug to integration suite

* Remove hardhat instance from integration test

* change description, drop echo

---------

Co-authored-by: Eric <[email protected]>
Co-authored-by: gmega <[email protected]>
Signed-off-by: Slava <[email protected]>
@veaceslavdoina
Copy link
Contributor Author

veaceslavdoina commented Jun 27, 2024

We can't rebase due to conflicts

Screenshot 2024-06-27 at 08 51 05

@veaceslavdoina veaceslavdoina merged commit 7602adc into release/0.1 Jun 27, 2024
1 of 7 checks passed
@veaceslavdoina veaceslavdoina deleted the master-release-release-v0.1.2 branch June 27, 2024 05:51
veaceslavdoina added a commit that referenced this pull request Jul 3, 2024
* fix: createReservation lock (#825)

* fix: createReservation lock

* fix: additional locking places

* fix: acquire lock

* chore: feedback

Co-authored-by: markspanbroek <[email protected]>
Signed-off-by: Adam Uhlíř <[email protected]>

* feat: withLock template and fixed tests

* fix: use proc for MockReservations constructor

* chore: feedback

Co-authored-by: Eric <[email protected]>
Signed-off-by: Adam Uhlíř <[email protected]>

* chore: feedback implementation

---------

Signed-off-by: Adam Uhlíř <[email protected]>
Co-authored-by: markspanbroek <[email protected]>
Co-authored-by: Eric <[email protected]>

* Block deletion with ref count & repostore refactor (#631)

* Fix StoreStream so it doesn't return parity bytes  (#838)

* fix storestream so it doesn\'t return parity bits for protected/verifiable manifests

* use Cid.example instead of creating a mock manually

* Fix verifiable manifest initialization (#839)

* fix verifiable manifest initialization

* fix linearstrategy, use verifiableStrategy to select blocks for slots

* check for both strategies in attribute inheritance test

* ci: add verify_circuit=true to the releases (#840)

* provisional fix so EC errors do not crash the node on download (#841)

* prevent node crashing with `not val.isNil` (#843)

* bump nim-leopard to handle no parity data (#845)

* Fix verifiable manifest constructor (#844)

* Fix verifiable manifest constructor

* Add integration test for verifiable manifest download

Add integration test for testing download of verifiable dataset after creating request for storage

* add missing import

* add testecbug to integration suite

* Remove hardhat instance from integration test

* change description, drop echo

---------

Co-authored-by: Eric <[email protected]>
Co-authored-by: gmega <[email protected]>

---------

Signed-off-by: Adam Uhlíř <[email protected]>
Signed-off-by: Slava <[email protected]>
Co-authored-by: Adam Uhlíř <[email protected]>
Co-authored-by: markspanbroek <[email protected]>
Co-authored-by: Eric <[email protected]>
Co-authored-by: Tomasz Bekas <[email protected]>
Co-authored-by: Giuliano Mega <[email protected]>
@veaceslavdoina veaceslavdoina mentioned this pull request Jul 3, 2024
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.

None yet

5 participants