Skip to content

Commit 956688d

Browse files
committed
Fix CI again
1 parent 7f45f4a commit 956688d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
106106

107107
- name: "Run PHPUnit Tests"
108-
run: SPC_TARGET=glibc vendor/bin/phpunit tests/ --no-coverage
108+
run: SPC_LIBC=glibc vendor/bin/phpunit tests/ --no-coverage
109109

110110
define-matrix:
111111
name: "Define Matrix"

bin/build-static-frankenphp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ADD ./bin/spc /app/bin/spc
9292
RUN /app/bin/setup-runtime
9393
RUN /app/bin/php /app/bin/composer install --no-dev --classmap-authoritative
9494
ENV PATH="/app/bin:/cmake/bin:/usr/local/go/bin:$PATH"
95-
ENV SPC_TARGET=glibc
95+
ENV SPC_LIBC=glibc
9696
9797
ADD ./config/env.ini /app/config/env.ini
9898
RUN bin/spc doctor --auto-fix --debug
@@ -146,7 +146,7 @@ echo 'CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
146146
echo 'AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
147147
echo 'LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
148148
echo 'SPC_DEFAULT_C_FLAGS=-fPIE -fPIC' >> /tmp/spc-gnu-docker.env
149-
echo 'SPC_TARGET=glibc' >> /tmp/spc-gnu-docker.env
149+
echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
150150
echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
151151
echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
152152

bin/spc-gnu-docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ADD ./bin/setup-runtime /app/bin/setup-runtime
107107
ADD ./bin/spc /app/bin/spc
108108
RUN /app/bin/setup-runtime
109109
RUN /app/bin/php /app/bin/composer install --no-dev
110-
ENV SPC_TARGET=glibc
110+
ENV SPC_LIBC=glibc
111111
ENV PATH="/app/bin:/cmake/bin:/opt/rh/devtoolset-10/root/usr/bin:\$PATH"
112112
113113
ADD ./config/env.ini /app/config/env.ini
@@ -154,7 +154,7 @@ fi
154154

155155
# Apply env in temp env file
156156
echo 'SPC_DEFAULT_C_FLAGS=-fPIC' > /tmp/spc-gnu-docker.env
157-
echo 'SPC_TARGET=glibc' >> /tmp/spc-gnu-docker.env
157+
echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
158158
echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
159159
echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
160160

0 commit comments

Comments
 (0)