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

Generate lock files #778

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Generate lock files #778

merged 1 commit into from
Oct 17, 2023

Conversation

maciektr
Copy link
Contributor

@maciektr maciektr commented Oct 10, 2023 •
edited
Loading

commit-id:5ad45dc3

Stack:

⚠️ Part of a stack created by spr. Do not merge manually using the UI - doing so may have unexpected results.

This was referenced Oct 10, 2023
Merged
Merged
Merged
github-merge-queue bot pushed a commit that referenced this pull request Oct 10, 2023
@maciektr
Revert matching parsing errors in git db client contains method (#774)
38b2aae 
commit-id:9f949bd5

---

**Stack**:
- #778
- #777
- #775
- #774 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr maciektr mentioned this pull request Oct 10, 2023
Merged
@maciektr maciektr mentioned this pull request Oct 10, 2023
Merged
@maciektr maciektr mentioned this pull request Oct 10, 2023
Merged
@maciektr maciektr marked this pull request as ready for review October 10, 2023 15:31
@maciektr maciektr requested a review from mkaput as a code owner October 10, 2023 15:31
github-merge-queue bot pushed a commit that referenced this pull request Oct 10, 2023
@maciektr
Ensure git checkout returns existing revision (#775)
95885ad 
commit-id:48d35381

---

**Stack**:
- #781
- #780
- #779
- #778
- #777
- #775 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
mkaput
mkaput requested changes Oct 11, 2023
View reviewed changes
scarb/src/core/lockfile.rs Outdated Show resolved Hide resolved
scarb/src/core/lockfile.rs Outdated Show resolved Hide resolved
scarb/src/core/workspace.rs Outdated Show resolved Hide resolved
@maciektr maciektr requested a review from mkaput October 11, 2023 12:09
mkaput
mkaput requested changes Oct 12, 2023
View reviewed changes
scarb/src/ops/lockfile.rs Outdated Show resolved Hide resolved
scarb/src/ops/resolve.rs Show resolved Hide resolved
@maciektr maciektr changed the base branch from spr/main/a905a9c2 to main October 16, 2023 23:32
@maciektr maciektr mentioned this pull request Oct 16, 2023
Merged
@maciektr maciektr changed the base branch from main to spr/main/a905a9c2 October 16, 2023 23:32
mkaput
mkaput approved these changes Oct 17, 2023
View reviewed changes
scarb/src/ops/lockfile.rs Outdated Show resolved Hide resolved
mkaput
mkaput previously requested changes Oct 17, 2023
View reviewed changes
scarb/src/ops/lockfile.rs Outdated Show resolved Hide resolved
Base automatically changed from spr/main/a905a9c2 to main October 17, 2023 14:58
github-merge-queue bot pushed a commit that referenced this pull request Oct 17, 2023
@maciektr
Add lockfile structure (#777)
c265190 
commit-id:a905a9c2

---

**Stack**:
- #781
- #800
- #780
- #779
- #778
- #777 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Co-authored-by: MrDenkoV <stanislaw.denkowski@swmansion.com>
@MrDenkoV @maciektr
Generate lock files
1574e1d 
commit-id:5ad45dc3
@maciektr maciektr enabled auto-merge October 17, 2023 15:44
@maciektr maciektr requested a review from mkaput October 17, 2023 15:51
@maciektr maciektr dismissed mkaput’s stale review October 17, 2023 16:07

discussed offline

@maciektr maciektr added this pull request to the merge queue Oct 17, 2023
Merged via the queue into main with commit 8569ab1 Oct 17, 2023
@maciektr maciektr deleted the spr/main/5ad45dc3 branch October 17, 2023 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkaput mkaput Awaiting requested review from mkaput

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maciektr @mkaput @MrDenkoV