Skip to content

Commit 27b27ba

Browse files
dependabot[bot]vtjnash
authored andcommitted
build(deps): bump actions/checkout from 3 to 4 (libuv#4490)
Requires updating the android builder, since the arm emulator is deprecated and unavailable now. Switch to using a Github Action plugin instead of a container, so that hopefully future updates will be delivered via that channel instead. Changed the idna test since printf returns EILSEQ for some byte sequences in the format on Android in glibc. We don't fully understand the cause, but we can avoid that by not asking it to reencode the bytes in the current locale settings. For backport: removing android CI instead, since we don't need it
1 parent e6ea630 commit 27b27ba

3 files changed

Lines changed: 11 additions & 25 deletions

File tree

.github/workflows/CI-unix.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,6 @@ jobs:
2727
run: |
2828
make -C build distcheck
2929
30-
build-android:
31-
runs-on: ubuntu-latest
32-
container: reactnativecommunity/react-native-android:2020-5-20
33-
steps:
34-
- uses: actions/checkout@v3
35-
- name: Envinfo
36-
run: npx envinfo
37-
- name: Configure android arm64
38-
# see build options you can use in https://developer.android.com/ndk/guides/cmake
39-
run: |
40-
mkdir build
41-
cd build
42-
$ANDROID_HOME/cmake/3.10.2.4988404/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/20.0.5594570/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 ..
43-
- name: Build android arm64
44-
run: |
45-
$ANDROID_HOME/cmake/3.10.2.4988404/bin/cmake --build build
46-
ls -lh build
47-
4830
build-macos:
4931
runs-on: ${{ matrix.os }}
5032
strategy:

test/test-idna.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,55 @@ TEST_IMPL(utf8_decode1) {
3939

4040
/* Two-byte sequences. */
4141
p = b;
42-
snprintf(b, sizeof(b), "\xC2\x80\xDF\xBF");
42+
snprintf(b, sizeof(b), "%s", "\xC2\x80\xDF\xBF");
4343
ASSERT_EQ(128, uv__utf8_decode1(&p, b + sizeof(b)));
4444
ASSERT_PTR_EQ(p, b + 2);
4545
ASSERT_EQ(0x7FF, uv__utf8_decode1(&p, b + sizeof(b)));
4646
ASSERT_PTR_EQ(p, b + 4);
4747

4848
/* Three-byte sequences. */
4949
p = b;
50-
snprintf(b, sizeof(b), "\xE0\xA0\x80\xEF\xBF\xBF");
50+
snprintf(b, sizeof(b), "%s", "\xE0\xA0\x80\xEF\xBF\xBF");
5151
ASSERT_EQ(0x800, uv__utf8_decode1(&p, b + sizeof(b)));
5252
ASSERT_PTR_EQ(p, b + 3);
5353
ASSERT_EQ(0xFFFF, uv__utf8_decode1(&p, b + sizeof(b)));
5454
ASSERT_PTR_EQ(p, b + 6);
5555

5656
/* Four-byte sequences. */
5757
p = b;
58-
snprintf(b, sizeof(b), "\xF0\x90\x80\x80\xF4\x8F\xBF\xBF");
58+
snprintf(b, sizeof(b), "%s", "\xF0\x90\x80\x80\xF4\x8F\xBF\xBF");
5959
ASSERT_EQ(0x10000, uv__utf8_decode1(&p, b + sizeof(b)));
6060
ASSERT_PTR_EQ(p, b + 4);
6161
ASSERT_EQ(0x10FFFF, uv__utf8_decode1(&p, b + sizeof(b)));
6262
ASSERT_PTR_EQ(p, b + 8);
6363

6464
/* Four-byte sequences > U+10FFFF; disallowed. */
6565
p = b;
66-
snprintf(b, sizeof(b), "\xF4\x90\xC0\xC0\xF7\xBF\xBF\xBF");
66+
snprintf(b, sizeof(b), "%s", "\xF4\x90\xC0\xC0\xF7\xBF\xBF\xBF");
6767
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
6868
ASSERT_PTR_EQ(p, b + 4);
6969
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
7070
ASSERT_PTR_EQ(p, b + 8);
7171

7272
/* Overlong; disallowed. */
7373
p = b;
74-
snprintf(b, sizeof(b), "\xC0\x80\xC1\x80");
74+
snprintf(b, sizeof(b), "%s", "\xC0\x80\xC1\x80");
7575
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
7676
ASSERT_PTR_EQ(p, b + 2);
7777
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
7878
ASSERT_PTR_EQ(p, b + 4);
7979

8080
/* Surrogate pairs; disallowed. */
8181
p = b;
82-
snprintf(b, sizeof(b), "\xED\xA0\x80\xED\xA3\xBF");
82+
snprintf(b, sizeof(b), "%s", "\xED\xA0\x80\xED\xA3\xBF");
8383
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
8484
ASSERT_PTR_EQ(p, b + 3);
8585
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));
8686
ASSERT_PTR_EQ(p, b + 6);
8787

8888
/* Simply illegal. */
8989
p = b;
90-
snprintf(b, sizeof(b), "\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF");
90+
snprintf(b, sizeof(b), "%s", "\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF");
9191

9292
for (i = 1; i <= 8; i++) {
9393
ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + sizeof(b)));

test/test-udp-multicast-join.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,10 @@ TEST_IMPL(udp_multicast_join) {
161161
if (r == UV_ENODEV)
162162
RETURN_SKIP("No multicast support.");
163163
ASSERT_OK(r);
164+
#if defined(__ANDROID__)
165+
/* It returns an ENOSYS error */
166+
RETURN_SKIP("Test does not currently work in ANDROID");
167+
#endif
164168

165169
r = uv_udp_recv_start(&server, alloc_cb, cl_recv_cb);
166170
ASSERT_OK(r);

0 commit comments

Comments
 (0)