Skip to content

Commit

Permalink
Make the branch from which Watcher is built a release branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Will committed Oct 7, 2024
1 parent 56d2f99 commit 68c1f62
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ COPY --link internal internal
COPY --link testdata testdata

# install edant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=next
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN curl -L https://github.com/e-dant/watcher/archive/refs/heads/$EDANT_WATCHER_VERSION.tar.gz | tar xz
WORKDIR /usr/local/src/watcher/watcher-$EDANT_WATCHER_VERSION/watcher-c
Expand Down
2 changes: 1 addition & 1 deletion alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ COPY --link internal internal
COPY --link testdata testdata

# install edant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=next
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN curl -L https://github.com/e-dant/watcher/archive/refs/heads/$EDANT_WATCHER_VERSION.tar.gz | tar xz
WORKDIR /usr/local/src/watcher/watcher-$EDANT_WATCHER_VERSION/watcher-c
Expand Down
2 changes: 1 addition & 1 deletion build-static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ if [ "${os}" = "linux" ]; then
fi
# install edant/watcher for file watching (static version)
git clone --branch="${EDANT_WATCHER_VERSION:-next}" https://github.com/e-dant/watcher watcher
git clone --branch="${EDANT_WATCHER_VERSION:-release}" https://github.com/e-dant/watcher watcher
cd watcher/watcher-c
cc -c -o libwatcher.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra -fPIC
ar rcs libwatcher.a libwatcher.o
Expand Down
2 changes: 1 addition & 1 deletion dev-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN git clone --branch=PHP-8.3 https://github.com/php/php-src.git . && \
php --version

# install edant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=next
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher .
WORKDIR /usr/local/src/watcher/watcher-c
Expand Down
2 changes: 1 addition & 1 deletion dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN git clone --branch=PHP-8.3 https://github.com/php/php-src.git . && \
php --version

# install edant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=next
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher .
WORKDIR /usr/local/src/watcher/watcher-c
Expand Down

0 comments on commit 68c1f62

Please sign in to comment.