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

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

Commits on Feb 23, 2024

  1. chan!(*): replace -> replaces (pacstall#1016)

    Co-authored-by: oklopfer <[email protected]>
    Elsie19 and oklopfer authored Feb 23, 2024
    Configuration menu
    Copy the full SHA
    2bc258e View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Configuration menu
    Copy the full SHA
    07fc693 View commit details
    Browse the repository at this point in the history
  2. feat(CI): turn docker images into locally produced matrix (pacstall#1041

    )
    
    Co-authored-by: ook37 <[email protected]>
    Co-authored-by: Elsie <[email protected]>
    3 people authored Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5b797ba View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. refactor(*)!: SRCDIR -> PACDIR, pkgbase -> srcdir (pacstall#1045

    )
    
    Co-authored-by: ook37 <[email protected]>
    oklopfer and ook37 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    0bbf3f8 View commit details
    Browse the repository at this point in the history
  2. chan!(*): name -> pkgname (pacstall#1017)

    Co-authored-by: oklopfer <[email protected]>
    Elsie19 and oklopfer authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    65989c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    f8debc3 View commit details
    Browse the repository at this point in the history
  2. fix(upgrade.sh): export CARCH & DISTRO (pacstall#1047)

    Co-authored-by: ook37 <[email protected]>
    oklopfer and ook37 authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    d19966d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    602c4f3 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. chan!(*): url -> {test_,}source_url, homepage -> url (pacstal…

    …l#1051)
    
    Co-authored-by: ook37 <[email protected]>
    oklopfer and ook37 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    926acb3 View commit details
    Browse the repository at this point in the history
  2. chan!(*): hash -> *sums (pacstall#1053)

    Co-authored-by: ook37 <[email protected]>
    oklopfer and ook37 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    c4faad2 View commit details
    Browse the repository at this point in the history
  3. feat({build,install}-local.sh): add conflicts array (pacstall#1054)

    Co-authored-by: ook37 <[email protected]>
    oklopfer and ook37 authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    736656f View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Configuration menu
    Copy the full SHA
    ce7730e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b88c572 View commit details
    Browse the repository at this point in the history