Skip to content

Commit f7f3b49

Browse files
alexcrichtonalexcrichton
authored
Update tooling used in CI (#1429)
* Update tooling used in CI See if the async job can start passing again * More updates... * Update C tests to compile again
1 parent d44d953 commit f7f3b49

26 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎.github/actions/install-wasi-sdk/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ runs:
55
using: composite
66
steps:
77
- run: |
8-
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-28/wasi-sdk-28.0-x86_64-linux.tar.gz -L | tar xzvf -
9-
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-28.0-x86_64-linux" >> $GITHUB_ENV
8+
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-29/wasi-sdk-29.0-x86_64-linux.tar.gz -L | tar xzvf -
9+
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-29.0-x86_64-linux" >> $GITHUB_ENV
1010
if: runner.os == 'Linux'
1111
shell: bash
1212
- run: |
13-
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-28/wasi-sdk-28.0-x86_64-macos.tar.gz -L | tar xzvf -
14-
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-28.0-x86_64-macos" >> $GITHUB_ENV
13+
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-29/wasi-sdk-29.0-x86_64-macos.tar.gz -L | tar xzvf -
14+
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-29.0-x86_64-macos" >> $GITHUB_ENV
1515
if: runner.os == 'macOS'
1616
shell: bash
1717
- run: |
18-
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-28/wasi-sdk-28.0-x86_64-windows.tar.gz -L | tar xzvf -
19-
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-28.0-x86_64-windows" >> $GITHUB_ENV
18+
curl https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-29/wasi-sdk-29.0-x86_64-windows.tar.gz -L | tar xzvf -
19+
echo "WASI_SDK_PATH=`pwd`/wasi-sdk-29.0-x86_64-windows" >> $GITHUB_ENV
2020
if: runner.os == 'Windows'
2121
shell: bash
2222
- name: Setup `wasm-tools`
2323
uses: bytecodealliance/actions/wasm-tools/setup@v1
2424
with:
25-
version: "1.240.0"
25+
version: "1.241.2"
2626
- name: Setup `wasmtime`
2727
uses: bytecodealliance/actions/wasmtime/setup@v1
2828
with:
29-
version: "38.0.3"
29+
version: "dev"

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
with:
123123
submodules: true
124124
- name: Install Rust
125-
run: rustup update beta --no-self-update && rustup default beta
125+
run: rustup update nightly --no-self-update && rustup default nightly
126126
- run: rustup target add wasm32-wasip2
127127
- uses: ./.github/actions/install-wasi-sdk
128128
- run: |

‎tests/runtime-async/async/cancel-import/runner.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ int main() {
88
{
99
test_future_void_writer_t writer;
1010
test_future_void_t reader = test_future_void_new(&writer);
11-
runner_subtask_status_t status = test_async_pending_import(reader);
11+
runner_subtask_status_t status = test_pending_import(reader);
1212
assert(RUNNER_SUBTASK_STATE(status) == RUNNER_SUBTASK_STARTED);
1313
runner_subtask_t subtask = RUNNER_SUBTASK_HANDLE(status);
1414
assert(subtask != 0);
@@ -31,15 +31,15 @@ int main() {
3131
test_future_void_t reader2 = test_future_void_new(&writer2);
3232

3333
// start up one task, it'll be in "STARTED"
34-
runner_subtask_status_t status = test_async_pending_import(reader1);
34+
runner_subtask_status_t status = test_pending_import(reader1);
3535
assert(RUNNER_SUBTASK_STATE(status) == RUNNER_SUBTASK_STARTED);
3636
runner_subtask_t subtask1 = RUNNER_SUBTASK_HANDLE(status);
3737
assert(subtask1 != 0);
3838

3939
// Start up a second task after setting the backpressure flag, forcing it
4040
// to be in the "STARTING" state.
4141
test_backpressure_set(true);
42-
status = test_async_pending_import(reader2);
42+
status = test_pending_import(reader2);
4343
assert(RUNNER_SUBTASK_STATE(status) == RUNNER_SUBTASK_STARTING);
4444
runner_subtask_t subtask2 = RUNNER_SUBTASK_HANDLE(status);
4545
assert(subtask2 != 0);

‎tests/runtime-async/async/cancel-import/test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct my_task {
99
exports_test_future_void_t future;
1010
};
1111

12-
test_callback_code_t exports_test_async_pending_import(exports_test_future_void_t x) {
12+
test_callback_code_t exports_test_pending_import(exports_test_future_void_t x) {
1313
struct my_task *task = (struct my_task*) malloc(sizeof(struct my_task));
1414
assert(task != NULL);
1515
test_waitable_status_t status = exports_test_future_void_read(x);
@@ -22,7 +22,7 @@ test_callback_code_t exports_test_async_pending_import(exports_test_future_void_
2222
return TEST_CALLBACK_CODE_WAIT(task->set);
2323
}
2424

25-
test_callback_code_t exports_test_async_pending_import_callback(test_event_t *event) {
25+
test_callback_code_t exports_test_pending_import_callback(test_event_t *event) {
2626
struct my_task *task = (struct my_task*) test_context_get();
2727
if (event->event == TEST_EVENT_CANCEL) {
2828
assert(event->waitable == 0);
@@ -37,7 +37,7 @@ test_callback_code_t exports_test_async_pending_import_callback(test_event_t *ev
3737
assert(event->waitable == task->future);
3838
assert(TEST_WAITABLE_STATE(event->code) == TEST_WAITABLE_COMPLETED);
3939
assert(TEST_WAITABLE_COUNT(event->code) == 0);
40-
exports_test_async_pending_import_return();
40+
exports_test_pending_import_return();
4141
}
4242

4343
test_waitable_join(task->future, 0);

‎tests/runtime-async/async/future-cancel-read/runner.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ int main() {
88
test_future_u32_writer_t writer;
99
test_future_u32_t reader = test_future_u32_new(&writer);
1010

11-
runner_subtask_status_t status = test_async_cancel_before_read(reader);
11+
runner_subtask_status_t status = test_cancel_before_read(reader);
1212
assert(status == RUNNER_SUBTASK_RETURNED);
1313
uint32_t value = 0;
1414
runner_waitable_status_t wstatus = test_future_u32_write(writer, &value);
@@ -21,7 +21,7 @@ int main() {
2121
test_future_u32_writer_t writer;
2222
test_future_u32_t reader = test_future_u32_new(&writer);
2323

24-
runner_subtask_status_t status = test_async_cancel_after_read(reader);
24+
runner_subtask_status_t status = test_cancel_after_read(reader);
2525
assert(status == RUNNER_SUBTASK_RETURNED);
2626

2727
uint32_t value = 0;
@@ -36,7 +36,7 @@ int main() {
3636
test_future_u32_t data_reader = test_future_u32_new(&data_writer);
3737
test_future_void_writer_t signal_writer;
3838
test_future_void_t signal_reader = test_future_void_new(&signal_writer);
39-
runner_subtask_status_t status = test_async_start_read_then_cancel(data_reader, signal_reader);
39+
runner_subtask_status_t status = test_start_read_then_cancel(data_reader, signal_reader);
4040
assert(RUNNER_SUBTASK_STATE(status) == RUNNER_SUBTASK_STARTED);
4141
runner_subtask_t task = RUNNER_SUBTASK_HANDLE(status);
4242

‎tests/runtime-async/async/future-cancel-read/test.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
#include <stdlib.h>
66

77
// This is a test of a Rust-ism, nothing to do in C.
8-
test_callback_code_t exports_test_async_cancel_before_read(exports_test_future_u32_t x) {
8+
test_callback_code_t exports_test_cancel_before_read(exports_test_future_u32_t x) {
99
exports_test_future_u32_drop_readable(x);
10-
exports_test_async_cancel_before_read_return();
10+
exports_test_cancel_before_read_return();
1111
return TEST_CALLBACK_CODE_EXIT;
1212
}
1313

14-
test_callback_code_t exports_test_async_cancel_before_read_callback(test_event_t *event) {
14+
test_callback_code_t exports_test_cancel_before_read_callback(test_event_t *event) {
1515
assert(0);
1616
}
1717

18-
test_callback_code_t exports_test_async_cancel_after_read(exports_test_future_u32_t x) {
18+
test_callback_code_t exports_test_cancel_after_read(exports_test_future_u32_t x) {
1919
uint32_t result;
2020
test_waitable_status_t status = exports_test_future_u32_read(x, &result);
2121
assert(status == TEST_WAITABLE_STATUS_BLOCKED);
@@ -25,11 +25,11 @@ test_callback_code_t exports_test_async_cancel_after_read(exports_test_future_u3
2525

2626
exports_test_future_u32_drop_readable(x);
2727

28-
exports_test_async_cancel_after_read_return();
28+
exports_test_cancel_after_read_return();
2929
return TEST_CALLBACK_CODE_EXIT;
3030
}
3131

32-
test_callback_code_t exports_test_async_cancel_after_read_callback(test_event_t *event) {
32+
test_callback_code_t exports_test_cancel_after_read_callback(test_event_t *event) {
3333
assert(0);
3434
}
3535

@@ -40,7 +40,7 @@ struct start_read_then_cancel_state {
4040
uint32_t result;
4141
};
4242

43-
test_callback_code_t exports_test_async_start_read_then_cancel(
43+
test_callback_code_t exports_test_start_read_then_cancel(
4444
exports_test_future_u32_t data,
4545
exports_test_future_void_t signal
4646
) {
@@ -62,7 +62,7 @@ test_callback_code_t exports_test_async_start_read_then_cancel(
6262
return TEST_CALLBACK_CODE_WAIT(state->set);
6363
}
6464

65-
test_callback_code_t exports_test_async_start_read_then_cancel_callback(test_event_t *event) {
65+
test_callback_code_t exports_test_start_read_then_cancel_callback(test_event_t *event) {
6666
struct start_read_then_cancel_state *state =
6767
(struct start_read_then_cancel_state*) test_context_get();
6868
assert(event->event == TEST_EVENT_FUTURE_READ);
@@ -80,6 +80,6 @@ test_callback_code_t exports_test_async_start_read_then_cancel_callback(test_eve
8080
exports_test_future_void_drop_readable(state->signal);
8181
test_waitable_set_drop(state->set);
8282

83-
exports_test_async_start_read_then_cancel_return();
83+
exports_test_start_read_then_cancel_return();
8484
return TEST_CALLBACK_CODE_EXIT;
8585
}

‎tests/runtime-async/async/future-cancel-write/runner.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int main() {
5353
runner_waitable_status_t status = test_future_string_write(writer, &string);
5454
assert(status == RUNNER_WAITABLE_STATUS_BLOCKED);
5555

56-
runner_subtask_status_t status2 = test_async_read_and_drop(reader);
56+
runner_subtask_status_t status2 = test_read_and_drop(reader);
5757
assert(status2 == RUNNER_SUBTASK_RETURNED);
5858

5959
status = test_future_string_cancel_write(writer);

‎tests/runtime-async/async/future-cancel-write/test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ void exports_test_take_then_drop(exports_test_future_string_t x) {
77
exports_test_future_string_drop_readable(x);
88
}
99

10-
test_callback_code_t exports_test_async_read_and_drop(exports_test_future_string_t x) {
10+
test_callback_code_t exports_test_read_and_drop(exports_test_future_string_t x) {
1111
test_string_t string;
1212
test_waitable_status_t status = exports_test_future_string_read(x, &string);
1313
assert(TEST_WAITABLE_STATE(status) == TEST_WAITABLE_COMPLETED);
@@ -16,10 +16,10 @@ test_callback_code_t exports_test_async_read_and_drop(exports_test_future_string
1616
exports_test_future_string_drop_readable(x);
1717
test_string_free(&string);
1818

19-
exports_test_async_read_and_drop_return();
19+
exports_test_read_and_drop_return();
2020
return TEST_CALLBACK_CODE_EXIT;
2121
}
2222

23-
test_callback_code_t exports_test_async_read_and_drop_callback(test_event_t *event) {
23+
test_callback_code_t exports_test_read_and_drop_callback(test_event_t *event) {
2424
assert(0);
2525
}

‎tests/runtime-async/async/pending-import/runner.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
int main() {
88
test_future_void_writer_t writer;
99
test_future_void_t reader = test_future_void_new(&writer);
10-
runner_subtask_status_t status = test_async_pending_import(reader);
10+
runner_subtask_status_t status = test_pending_import(reader);
1111
assert(RUNNER_SUBTASK_STATE(status) == RUNNER_SUBTASK_STARTED);
1212
runner_subtask_t subtask = RUNNER_SUBTASK_HANDLE(status);
1313
assert(subtask != 0);

‎tests/runtime-async/async/pending-import/test.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct my_task {
99
exports_test_future_void_t future;
1010
};
1111

12-
test_callback_code_t exports_test_async_pending_import(exports_test_future_void_t x) {
12+
test_callback_code_t exports_test_pending_import(exports_test_future_void_t x) {
1313
struct my_task *task = (struct my_task*) malloc(sizeof(struct my_task));
1414
assert(task != NULL);
1515
test_waitable_status_t status = exports_test_future_void_read(x);
@@ -22,13 +22,13 @@ test_callback_code_t exports_test_async_pending_import(exports_test_future_void_
2222
return TEST_CALLBACK_CODE_WAIT(task->set);
2323
}
2424

25-
test_callback_code_t exports_test_async_pending_import_callback(test_event_t *event) {
25+
test_callback_code_t exports_test_pending_import_callback(test_event_t *event) {
2626
struct my_task *task = (struct my_task*) test_context_get();
2727
assert(event->event == TEST_EVENT_FUTURE_READ);
2828
assert(event->waitable == task->future);
2929
assert(TEST_WAITABLE_STATE(event->code) == TEST_WAITABLE_COMPLETED);
3030
assert(TEST_WAITABLE_COUNT(event->code) == 0);
31-
exports_test_async_pending_import_return();
31+
exports_test_pending_import_return();
3232

3333
test_waitable_join(task->future, 0);
3434
exports_test_future_void_drop_readable(task->future);

0 commit comments

Comments
 (0)