From 68c1f62e9d4428a37e58f137a47ee72a73ec9329 Mon Sep 17 00:00:00 2001 From: Will Date: Mon, 7 Oct 2024 17:48:16 -0400 Subject: [PATCH] Make the branch from which Watcher is built a release branch --- Dockerfile | 2 +- alpine.Dockerfile | 2 +- build-static.sh | 2 +- dev-alpine.Dockerfile | 2 +- dev.Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a92104d8b..42e44193a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/alpine.Dockerfile b/alpine.Dockerfile index 81f5bf7da..077a3fff0 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -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 diff --git a/build-static.sh b/build-static.sh index ae5882d22..4c471e9f5 100755 --- a/build-static.sh +++ b/build-static.sh @@ -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 diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile index 60ded943f..5903f7e69 100644 --- a/dev-alpine.Dockerfile +++ b/dev-alpine.Dockerfile @@ -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 diff --git a/dev.Dockerfile b/dev.Dockerfile index 194e31091..f60883fb7 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -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