Skip to content

Commit b3c3c49

Browse files
committed
fix: Disable IPv6 in Windows cross-compilation tests
Docker doesn't have an IPv6 network by default, so these tests were failing when using IPv6.
1 parent e742ded commit b3c3c49

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/scripts/cmake-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ docker run \
1818
-e ENABLE_ARCH_i686="$i686" \
1919
-e ENABLE_ARCH_x86_64="$x86_64" \
2020
-e ENABLE_TEST=true \
21-
-e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \
21+
-e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON -DUSE_IPV6=OFF" \
2222
-e CMAKE_C_FLAGS="$C_FLAGS" \
2323
-e CMAKE_CXX_FLAGS="$CXX_FLAGS" \
2424
-e CMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \

INSTALL.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,13 @@ docker build \
322322
Run the container to build toxcore. The following options are available to
323323
customize the running of the container image.
324324

325-
| Name | Description | Expected Value | Default Value |
326-
| -------------------- | ------------------------------------------------------------------------------------------ | ----------------------------------- | --------------------------- |
327-
| `ALLOW_TEST_FAILURE` | Don't stop if a test suite fails. | "true" or "false" (case sensitive). | `false` |
328-
| `ENABLE_ARCH_i686` | Build 32-bit toxcore. The image should have been built with `SUPPORT_ARCH_i686` enabled. | "true" or "false" (case sensitive). | `true` |
329-
| `ENABLE_ARCH_x86_64` | Build 64-bit toxcore. The image should have been built with `SUPPORT_ARCH_x86_64` enabled. | "true" or "false" (case sensitive). | `true` |
330-
| `ENABLE_TEST` | Run the test suite. The image should have been built with `SUPPORT_TEST` enabled. | "true" or "false" (case sensitive). | `false` |
331-
| `EXTRA_CMAKE_FLAGS` | Extra arguments to pass to the CMake command when building toxcore. | CMake options. | `-DTEST_TIMEOUT_SECONDS=90` |
325+
| Name | Description | Expected Value | Default Value |
326+
| -------------------- | ------------------------------------------------------------------------------------------ | ----------------------------------- | ------------------------------------------ |
327+
| `ALLOW_TEST_FAILURE` | Don't stop if a test suite fails. | "true" or "false" (case sensitive). | `false` |
328+
| `ENABLE_ARCH_i686` | Build 32-bit toxcore. The image should have been built with `SUPPORT_ARCH_i686` enabled. | "true" or "false" (case sensitive). | `true` |
329+
| `ENABLE_ARCH_x86_64` | Build 64-bit toxcore. The image should have been built with `SUPPORT_ARCH_x86_64` enabled. | "true" or "false" (case sensitive). | `true` |
330+
| `ENABLE_TEST` | Run the test suite. The image should have been built with `SUPPORT_TEST` enabled. | "true" or "false" (case sensitive). | `false` |
331+
| `EXTRA_CMAKE_FLAGS` | Extra arguments to pass to the CMake command when building toxcore. | CMake options. | `-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF` |
332332

333333
Example of running the container with options
334334

other/docker/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ ENV ENABLE_TEST=false \
3434
ALLOW_TEST_FAILURE=false \
3535
ENABLE_ARCH_i686=true \
3636
ENABLE_ARCH_x86_64=true \
37-
EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90"
37+
EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF"
3838

3939
ENTRYPOINT ["bash", "./build_toxcore.sh"]

other/windows_build_script_toxcore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export ENABLE_TEST=false
1919
export ALLOW_TEST_FAILURE=false
2020
export ENABLE_ARCH_i686=true
2121
export ENABLE_ARCH_x86_64=true
22-
export EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90"
22+
export EXTRA_CMAKE_FLAGS="-DTEST_TIMEOUT_SECONDS=90 -DUSE_IPV6=OFF"
2323

2424
sh ./other/docker/windows/build_toxcore.sh

0 commit comments

Comments
 (0)