Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
abuild
abuild
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 25
    • Issues 25
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 16
    • Merge Requests 16
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • alpine
  • abuildabuild
  • Merge Requests
  • !75

Open
Opened Dec 01, 2020 by Max Rees@sroracleContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.alpinelinux.org/sroracle/abuild.git" "apkfoundry-alpine"
git checkout -b "sroracle/abuild-apkfoundry-alpine" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "sroracle/abuild-apkfoundry-alpine"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Interposition enhancements for use with APK Foundry

  • Overview 0
  • Commits 5
  • Changes 7

This standardizes the use of $APK as well as adding some other interposition variables:

  • $APK_FETCH (apk)
  • $ABUILD_GIT (git or true)
  • $ABUILD_FETCH (abuild-fetch)
  • $ABUILD_SRCDIR can override $srcdir
  • $ABUILD_PKGBASEDIR can override $pkgbasedir
  • $ABUILD_TMP can set $srcdir and $pkgbasedir for easy out-of-aports.git builds

This allows APK Foundry to build packages outside of a git tree easily (by setting $ABUILD_GIT to git -C ...) as well as make it easier to enforce network isolation while poking holes for source file and dependency downloading.

An older form of this patch set has been in use for some time on my personal machines while developing the project, and it was recently merged into Adélie's abuild.git as we prepare to setup CI using it.

https://dev.sick.bike/apkfoundry/

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: alpine/abuild!75
Source branch: apkfoundry-alpine