Update build-cli.yaml

.github/workflows/Test.yaml

@@ -17,7 +17,7 @@ jobs:
         env:
           runner: self-hosted
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           extensions: pcntl, xdebug
           tools: composer
       - name: Get composer cache directory

.github/workflows/build-cli.yaml

@@ -13,51 +13,12 @@ on:
     branches:
       - v2
 jobs:
-  build-linux:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ 'amd64', 'arm64' ]
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.HUB_USERNAME }}
-          password: ${{ secrets.HUB_PASSWORD }}
-      - name: Configure QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Configure docker
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: ${{ matrix.platform }}
-      - name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v3
-      - name: Build sources
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" > TOKEN
-          docker buildx build --secret id=github-token,src=./TOKEN --cache-to type=gha,mode=max,scope=${{ matrix.platform }} --cache-from type=gha,scope=${{ matrix.platform }} --pull --load --platform linux/${{ matrix.platform }} --target cli-base-alpine -t builder .
-      - name: Copy build
-        run: |
-          docker create --name builder builder
-          docker cp builder:/go/src/app/cli/dist/dphp bin/dphp
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: dphp-${{ runner.os }}-${{ matrix.platform }}
-          path: bin/dphp
   build-docker:
     runs-on: self-hosted
     outputs:
       image: ${{ steps.meta.outputs.tags }}
     steps:
       - uses: actions/checkout@v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.HUB_USERNAME }}
-          password: ${{ secrets.HUB_PASSWORD }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -104,7 +65,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           cache-from: type=gha,scope=image
           cache-to: type=gha,mode=max,scope=image
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
       - name: Build Test Image
         uses: docker/build-push-action@v6
         with:
@@ -118,53 +79,6 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           cache-from: type=gha,scope=image
           platforms: linux/amd64
-  build-osx:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ 'arm64', 'x86_64' ]
-    runs-on: ${{ matrix.platform == 'arm64' && 'macos-14' || 'macos-13' }}
-    env:
-      HOMEBREW_NO_AUTO_UPDATE: 1
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          cache-dependency-path: cli/go.sum
-          go-version-file: cli/go.mod
-      - name: Configure Version
-        run: |
-          if [ "${GITHUB_REF_TYPE}" == "tag" ]; then
-            export VERSION=${GITHUB_REF_NAME:1}
-          else
-            export VERSION=${GITHUB_SHA}
-          fi
-
-          echo "VERSION=${VERSION}" >> "${GITHUB_ENV}"
-      - name: Configure cache
-        uses: actions/cache@v4
-        with:
-          path: dist
-          key: ${{ matrix.platform }}-${{ hashFiles('cli/*.mod') }}
-      - name: Run doctor
-        run: |
-          export GITHUB_TOKEN "${{ secrets.GITHUB_TOKEN }}"
-          BUILD=no cli/build-php.sh
-      - name: Build php
-        run: |
-          export GITHUB_TOKEN "${{ secrets.GITHUB_TOKEN }}"
-          cli/build-php.sh
-      - name: Build cli
-        run: |
-          export GITHUB_TOKEN "${{ secrets.GITHUB_TOKEN }}"
-          cd cli && ./build.sh
-      - run: ls -lah cli/dist/
-      - run: ls -lah dist/ || true
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: dphp-${{ runner.os }}-${{ matrix.platform }}
-          path: cli/dist/dphp
   performance-test:
     name: Performance Test
     needs:

Dockerfile

@@ -1,5 +1,5 @@
-FROM golang:1.24.0-alpine AS golang-base
-FROM php:8.4.3-zts AS php-base
+FROM golang:1.24.5-alpine AS golang-base
+FROM php:8.4.10-zts AS php-base
 FROM golang-base AS cli-base-alpine
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
@@ -29,21 +29,21 @@ RUN apk update; \
 		m4 \
 		make \
 		pkgconfig \
-		php83 \
-		php83-common \
-		php83-ctype \
-		php83-curl \
-		php83-dom \
-		php83-mbstring \
-		php83-openssl \
-		php83-pcntl \
-		php83-phar \
-		php83-posix \
-		php83-session \
-		php83-sodium \
-		php83-tokenizer \
-		php83-xml \
-		php83-xmlwriter \
+		php84 \
+		php84-common \
+		php84-ctype \
+		php84-curl \
+		php84-dom \
+		php84-mbstring \
+		php84-openssl \
+		php84-pcntl \
+		php84-phar \
+		php84-posix \
+		php84-session \
+		php84-sodium \
+		php84-tokenizer \
+		php84-xml \
+		php84-xmlwriter \
 		upx \
 		wget \
 		xz ; \
@@ -54,6 +54,7 @@ ENV PHP_EXTENSIONS="apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,exif,fileinfo,fi
 ENV PHP_EXTENSION_LIBS="bzip2,freetype,libavif,libjpeg,libwebp,libzip"
 
 WORKDIR /go/src/app
+COPY .git /go/src/app/.git
 COPY cli/build-php.sh .
 RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) BUILD=no ./build-php.sh
 RUN --mount=type=secret,id=github-token GITHUB_TOKEN=$(cat /run/secrets/github-token) ./build-php.sh
@@ -107,7 +108,7 @@ ENV GOBIN=/usr/local/bin
 RUN go get durable_php
 #RUN go test ./...
 
-RUN go install -ldflags "-w -s -X 'main.version=$VERSION'"
+RUN  CGO_CFLAGS=$(php-config --includes) CGO_LDFLAGS="$(php-config --ldflags) $(php-config --libs)" go install --tags nowatcher -ldflags "-w -s -X 'main.version=$VERSION'"
 
 FROM common AS durable-php
 COPY --from=builder /usr/local/bin/durable_php /usr/local/bin/dphp