netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

plugins: support PLUGIN_MAIN as well

Browse Source
This commit is contained in:
Franco Fichtner
2024-08-09 13:44:50 +02:00
parent 52b971a24b
commit da411d3969
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mk/defaults.mk
+7 -6
View File
@@ -48,6 +48,7 @@ PLUGIN_ABI?= ${_PLUGIN_ABI}
PLUGIN_ABI?= 24.7
.endif
PLUGIN_MAIN?= master
PLUGIN_STABLE?= stable/${PLUGIN_ABI}
PHPBIN= ${LOCALBASE}/bin/php
@@ -129,7 +130,7 @@ mfc: ensure-stable
@git apply /tmp/mfc.diff
@git add ${.CURDIR}/${MFC}
@if ! git diff --quiet HEAD; then \
git commit -m "${MFC:S/^.$/${PLUGIN_DIR}/}: sync with master"; \
git commit -m "${MFC:S/^.$/${PLUGIN_DIR}/}: sync with ${PLUGIN_MAIN}"; \
fi
.else
@git checkout ${PLUGIN_STABLE}
@@ -137,19 +138,19 @@ mfc: ensure-stable
git cherry-pick --abort; \
fi
.endif
@git checkout master
@git checkout ${PLUGIN_MAIN}
.endfor
stable:
@git checkout ${PLUGIN_STABLE}
master:
@git checkout master
devel main ${PLUGIN_MAIN}:
@git checkout ${PLUGIN_MAIN}
rebase:
@git checkout ${PLUGIN_STABLE}
@git rebase -i
@git checkout master
@git checkout ${PLUGIN_MAIN}
log:
@git log --stat -p ${PLUGIN_STABLE}
@@ -157,4 +158,4 @@ log:
push:
@git checkout ${PLUGIN_STABLE}
@git push
@git checkout master
@git checkout ${PLUGIN_MAIN}