mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-16 12:29:10 +02:00
Merge branch 158
This commit is contained in:
@@ -103,6 +103,20 @@ RUN \
|
|||||||
apt-get clean all && \
|
apt-get clean all && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Add PR
|
||||||
|
RUN \
|
||||||
|
cd /home/pi/BirdNET-pi && \
|
||||||
|
git fetch origin pull/158/head:158 && \
|
||||||
|
git checkout main && \
|
||||||
|
git branch -D f-merge-prs || true && \
|
||||||
|
git checkout -b f-merge-prs && \
|
||||||
|
git merge 158 --no-edit && \
|
||||||
|
git stash && \
|
||||||
|
git checkout main && \
|
||||||
|
git merge f-merge-prs && \
|
||||||
|
git branch -d f-merge-prs && \
|
||||||
|
git branch -d 158
|
||||||
|
|
||||||
# Update with my repo if more recent
|
# Update with my repo if more recent
|
||||||
#WORKDIR /home/pi
|
#WORKDIR /home/pi
|
||||||
#RUN \
|
#RUN \
|
||||||
|
|||||||
Reference in New Issue
Block a user