diff --git a/.woodpecker/.build-docker.yml b/.woodpecker/.build-docker.yml index 301cd4947..1a08006d9 100644 --- a/.woodpecker/.build-docker.yml +++ b/.woodpecker/.build-docker.yml @@ -1,6 +1,3 @@ -labels: - platform: linux/aarch64 - clone: git: when: diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index f5b58cfbf..e1d2fb718 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,8 +1,6 @@ matrix: php: - "8.1" - platform: - - linux/aarch64 labels: platform: ${platform} diff --git a/.woodpecker/.cs.yml b/.woodpecker/.cs.yml index 047bfe5d7..852ab4891 100644 --- a/.woodpecker/.cs.yml +++ b/.woodpecker/.cs.yml @@ -1,8 +1,6 @@ matrix: php: - "8.1" - platform: - - linux/aarch64 labels: platform: ${platform} diff --git a/.woodpecker/.deploy-docker.yml b/.woodpecker/.deploy-docker.yml index 0c7c76324..8565f9e75 100644 --- a/.woodpecker/.deploy-docker.yml +++ b/.woodpecker/.deploy-docker.yml @@ -1,6 +1,3 @@ -labels: - platform: linux/aarch64 - clone: git: when: diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml index 779133ad5..966ff58fb 100644 --- a/.woodpecker/.test.yml +++ b/.woodpecker/.test.yml @@ -1,8 +1,6 @@ matrix: php: - "8.1" - platform: - - linux/aarch64 labels: platform: ${platform} diff --git a/tests/docker.sh b/tests/docker.sh index 40eed0b47..cafc0ac46 100755 --- a/tests/docker.sh +++ b/tests/docker.sh @@ -19,7 +19,8 @@ for f in 192.168.1.30 192.168.69.236 192.168.69.233 192.168.69.207 192.168.69.13 fi done -arches="arm64" +arches="" +#arches="arm64" if [ $has_x86 -eq 1 ]; then arches="$arches amd64" fi diff --git a/tests/dockerfiles/Dockerfile.alpine b/tests/dockerfiles/Dockerfile.alpine index 5f2363058..3478814d4 100644 --- a/tests/dockerfiles/Dockerfile.alpine +++ b/tests/dockerfiles/Dockerfile.alpine @@ -44,9 +44,9 @@ RUN set -eux; \ # Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default) # https://github.com/docker-library/php/issues/272 # -D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 (https://www.php.net/manual/en/intro.filesystem.php) -ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -g" +ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O0 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -g" ENV PHP_CPPFLAGS="$PHP_CFLAGS" -ENV PHP_LDFLAGS="-Wl,-O1 -pie" +ENV PHP_LDFLAGS="-Wl,-O0 -pie" ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA @@ -162,6 +162,7 @@ RUN set -eux; \ \ --disable-cgi \ \ + --enable-debug \ --enable-fpm \ --with-ffi \ --enable-pcntl \