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

fix merge conflicts #9

Merged
merged 13 commits into from
Mar 8, 2024
Merged

fix merge conflicts #9

merged 13 commits into from
Mar 8, 2024

Conversation

oklopfer
Copy link

@oklopfer oklopfer commented Mar 8, 2024

Checklist

  • I confirm that I have read the contributing guidelines, and this pull request is abiding by all the clauses stated in the guideline.

Elsie19 and others added 13 commits February 22, 2024 20:01
@Elsie19 @oklopfer
chan!(*): replace -> replaces (pacstall#1016)
2bc258e 
Co-authored-by: oklopfer <[email protected]>
@vigress8
fix({download,install}-local.sh): use more clean_fail_down (pacstal…
07fc693 
…l#1043)
@oklopfer @Elsie19
feat(CI): turn docker images into locally produced matrix (pacstall#1041
5b797ba 
)

Co-authored-by: ook37 <[email protected]>
Co-authored-by: Elsie <[email protected]>
@oklopfer
refactor(*)!: SRCDIR -> PACDIR, pkgbase -> srcdir (pacstall#1045
0bbf3f8 
)

Co-authored-by: ook37 <[email protected]>
@Elsie19 @oklopfer
chan!(*): name -> pkgname (pacstall#1017)
65989c4 
Co-authored-by: oklopfer <[email protected]>
@D-Brox
fix(search.sh): mapfile append (pacstall#1049)
f8debc3
@oklopfer
fix(upgrade.sh): export CARCH & DISTRO (pacstall#1047)
d19966d 
Co-authored-by: ook37 <[email protected]>
@oklopfer
feat(install-local.sh): fetch relative package files (pacstall#1048)
602c4f3 
Co-authored-by: ook37 <[email protected]>
@oklopfer
chan!(*): url -> {test_,}source_url, homepage -> url (pacstal…
926acb3 
…l#1051)

Co-authored-by: ook37 <[email protected]>
@oklopfer
chan!(*): hash -> *sums (pacstall#1053)
c4faad2 
Co-authored-by: ook37 <[email protected]>
@oklopfer
feat({build,install}-local.sh): add conflicts array (pacstall#1054)
736656f 
Co-authored-by: ook37 <[email protected]>
@oklopfer
feat({build,download}-local.sh: add {pre,post}_upgrade, pre_remove (
ce7730e 
pacstall#1055)

Co-authored-by: ook37 <[email protected]>
Merge remote-tracking branch 'elsie/maintainer-array' into HEAD
b88c572
@oklopfer oklopfer requested a review from Elsie19 as a code owner March 8, 2024 00:47
@Elsie19 Elsie19 merged commit d71403c into Elsie19:maintainer-array Mar 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Elsie19 Elsie19 Awaiting requested review from Elsie19

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

Successfully merging this pull request may close these issues.
4 participants
@oklopfer @Elsie19 @vigress8 @D-Brox