sig_core/toolkit
sig_core/toolkit
8
2
Fork 3
Code Issues 6 Pull requests 2 Projects Releases Wiki Activity Actions

fresh-empanadas - Bug fixes #20

Open
kemotaha wants to merge 16 commits from kemotaha/toolkit:fresh-empanadas into fresh-empanadas
pull from: kemotaha/toolkit:fresh-empanadas
merge into: sig_core:fresh-empanadas
Conversation 2 Commits 16 Files changed 22 +1217 -479
kemotaha commented 2024-10-07 21:27:50 +00:00
First-time contributor
Copy link

Bug fixes to empanadas

Bug fixes to empanadas
kemotaha added 4 commits 2024-10-07 21:27:53 +00:00
kemotaha changed title from fresh-empanadas to fresh-empanadas - Bug fixes 2024-10-07 21:28:13 +00:00
label commented 2024-10-07 22:17:01 +00:00
Owner
Copy link
                podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format(

This breaks scenarios where the compose dir (and by extension, the entries dir) is in an NFS mount. Our compose data is in NFS, This change would break our workflow.

Please consider using this change instead to see if this fixes your workflow. This prevents context changes.

This will require the fresh-empanadas branch to rebase against devel.

``` podman_cmd_entry = '{} run -d -it -v "{}:{}:z" -v "{}:{}:z" -v "{}:{}:z" --name {} --entrypoint {}/{} {}'.format( ``` This breaks scenarios where the compose dir (and by extension, the entries dir) is in an NFS mount. Our compose data is in NFS, This change would break our workflow. Please consider using [this change](https://git.resf.org/sig_core/toolkit/commit/08d899534443e1bd4c09728d6dd12f205c47e868) instead to see if this fixes your workflow. This prevents context changes. This will require the `fresh-empanadas` branch to rebase against devel.
kemotaha added 1 commit 2024-10-08 20:45:30 +00:00
kemotaha commented 2024-10-08 20:46:28 +00:00
Author
First-time contributor
Copy link

Looks like it worked. I updated the pull request to include that change over the other one I made.

Looks like it worked. I updated the pull request to include that change over the other one I made.
This pull request has changes conflicting with the target branch.
  • iso/empanadas/empanadas/util/shared.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fresh-empanadas:kemotaha-fresh-empanadas
git checkout kemotaha-fresh-empanadas

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout fresh-empanadas
git merge --no-ff kemotaha-fresh-empanadas
git checkout kemotaha-fresh-empanadas
git rebase fresh-empanadas
git checkout fresh-empanadas
git merge --ff-only kemotaha-fresh-empanadas
git checkout kemotaha-fresh-empanadas
git rebase fresh-empanadas
git checkout fresh-empanadas
git merge --no-ff kemotaha-fresh-empanadas
git checkout fresh-empanadas
git merge --squash kemotaha-fresh-empanadas
git checkout fresh-empanadas
git merge --ff-only kemotaha-fresh-empanadas
git checkout fresh-empanadas
git merge kemotaha-fresh-empanadas
git push origin fresh-empanadas
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: sig_core/toolkit#20
No description provided.
Delete branch "kemotaha/toolkit:fresh-empanadas"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?