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

backport Gluon modules Updater #448

Merged
merged 11 commits into from
Jul 23, 2024

Conversation

T0biii and others added 2 commits June 30, 2024 22:46
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
Copy link
Member Author

@T0biii T0biii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grische maybe you got some ideas how to handle the open issues

contrib/actions/update-modules.sh Outdated Show resolved Hide resolved
contrib/actions/update-modules.sh Outdated Show resolved Hide resolved
T0biii

This comment was marked as duplicate.

@T0biii T0biii force-pushed the update-bump-module-script branch from 59018ff to 2435aca Compare July 1, 2024 00:35
T0biii and others added 3 commits July 2, 2024 09:42
use gluon site feeds for the loop

Co-authored-by: Grische <2787581+grische@users.noreply.github.com>
@grische
Copy link
Contributor

grische commented Jul 5, 2024

@T0biii LGTM in general. Any further blockers? Do you maybe have some updated example runs?

@T0biii
Copy link
Member Author

T0biii commented Jul 5, 2024

@grische the only "blocker" is some updated example run :)

@T0biii T0biii self-assigned this Jul 9, 2024
@T0biii T0biii added the stable label Jul 10, 2024
@T0biii T0biii marked this pull request as ready for review July 20, 2024 00:13
@T0biii T0biii requested review from maurerle and a team as code owners July 20, 2024 00:13
@T0biii
Copy link
Member Author

T0biii commented Jul 21, 2024

@grische now it is ready for review

Copy link
Contributor

@grische grische left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any changes in comparison to the upstream version on this file?

.github/workflows/bump-modules.yml Show resolved Hide resolved
.github/workflows/bump-modules.yml Show resolved Hide resolved
@T0biii T0biii added the backport legacy Backport to Legacy Branch label Jul 23, 2024
@T0biii T0biii merged commit a2afe4c into freifunkMUC:stable Jul 23, 2024
2 checks passed
Copy link
Contributor

Created backport PR for legacy:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-448-to-legacy
git worktree add --checkout .worktree/backport-448-to-legacy backport-448-to-legacy
cd .worktree/backport-448-to-legacy
git reset --hard HEAD^
git cherry-pick -x a2afe4c03685258aa87344d00f2936908b1ec051
git push --force-with-lease

@T0biii T0biii added the backport next Backport to Next Branch label Sep 6, 2024
Copy link
Contributor

github-actions bot commented Sep 6, 2024

Git push to origin failed for legacy with exitcode 1

Copy link
Contributor

github-actions bot commented Sep 6, 2024

Created backport PR for next:

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-448-to-next
git worktree add --checkout .worktree/backport-448-to-next backport-448-to-next
cd .worktree/backport-448-to-next
git reset --hard HEAD^
git cherry-pick -x a2afe4c03685258aa87344d00f2936908b1ec051
git push --force-with-lease

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport legacy Backport to Legacy Branch backport next Backport to Next Branch stable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants